From 5e4db9faab1cc32b5afa75334b1216430510efa7 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Fri, 9 Jan 2009 13:01:36 +0000
Subject: [PATCH] --- yaml --- r: 133823 b: refs/heads/master c:
 2d8b223d81a385a746befc7facf93680f4185533 h: refs/heads/master i:   133821:
 391f7d6a21fe50d8c02ab20dba21bed19b69bf13   133819:
 024a79719da9cd547ce343d3827e9cb21b6fbfb7   133815:
 1fb1ad01a10f24457ad0dccf0b16ddd833ccc6ca   133807:
 a6e7b75d9e0b57198e84c2c7e52137ef982a32a2   133791:
 f493a682019dab3336cc95fafe073bb2fbc59644   133759:
 d58655d34b1f5c332766be34f9f7093f28186163 v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/net/hamradio/hdlcdrv.c | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 607f39577b18..7f901d821f67 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a7616af604caf0d436a1ed0d4298bb25cd77d67
+refs/heads/master: 2d8b223d81a385a746befc7facf93680f4185533
diff --git a/trunk/drivers/net/hamradio/hdlcdrv.c b/trunk/drivers/net/hamradio/hdlcdrv.c
index 1215a49c38f1..61de56e45eed 100644
--- a/trunk/drivers/net/hamradio/hdlcdrv.c
+++ b/trunk/drivers/net/hamradio/hdlcdrv.c
@@ -617,6 +617,14 @@ static int hdlcdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 
 /* --------------------------------------------------------------------- */
 
+static const struct net_device_ops hdlcdrv_netdev = {
+	.ndo_open	= hdlcdrv_open,
+	.ndo_stop	= hdlcdrv_close,
+	.ndo_start_xmit = hdlcdrv_send_packet,
+	.ndo_do_ioctl	= hdlcdrv_ioctl,
+	.ndo_set_mac_address = hdlcdrv_set_mac_address,
+};
+
 /*
  * Initialize fields in hdlcdrv
  */
@@ -656,21 +664,13 @@ static void hdlcdrv_setup(struct net_device *dev)
 	s->bitbuf_hdlc.shreg = 0x80;
 #endif /* HDLCDRV_DEBUG */
 
-	/*
-	 * initialize the device struct
-	 */
-	dev->open = hdlcdrv_open;
-	dev->stop = hdlcdrv_close;
-	dev->do_ioctl = hdlcdrv_ioctl;
-	dev->hard_start_xmit = hdlcdrv_send_packet;
-	dev->get_stats = hdlcdrv_get_stats;
 
 	/* Fill in the fields of the device structure */
 
 	s->skb = NULL;
 	
+	dev->netdev_ops = &hdlcdrv_netdev;
 	dev->header_ops = &ax25_header_ops;
-	dev->set_mac_address = hdlcdrv_set_mac_address;
 	
 	dev->type = ARPHRD_AX25;           /* AF_AX25 device */
 	dev->hard_header_len = AX25_MAX_HEADER_LEN + AX25_BPQ_HEADER_LEN;