8 files changed, 130 insertions, 196 deletions

diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index 2d4089894ec7..3da9f394b4c6 100644
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -322,23 +322,25 @@ static const struct header_ops sp_header_ops = {
         .rebuild        = sp_rebuild_header,
 };
 
+static const struct net_device_ops sp_netdev_ops = {
+        .ndo_open               = sp_open_dev,
+        .ndo_stop               = sp_close,
+        .ndo_start_xmit         = sp_xmit,
+        .ndo_set_mac_address    = sp_set_mac_address,
+};
+
 static void sp_setup(struct net_device *dev)
 {
         /* Finish setting up the DEVICE info. */
-        dev->mtu                = SIXP_MTU;
-        dev->hard_start_xmit    = sp_xmit;
-        dev->open               = sp_open_dev;
+        dev->netdev_ops         = &sp_netdev_ops;
         dev->destructor         = free_netdev;
-        dev->stop               = sp_close;
-
-        dev->set_mac_address    = sp_set_mac_address;
+        dev->mtu                = SIXP_MTU;
         dev->hard_header_len    = AX25_MAX_HEADER_LEN;
         dev->header_ops         = &sp_header_ops;
 
         dev->addr_len           = AX25_ADDR_LEN;
         dev->type               = ARPHRD_AX25;
         dev->tx_queue_len       = 10;
-        dev->tx_timeout         = NULL;
 
         /* Only activated in AX.25 mode */
         memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);
diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c
index 81a65e3a1c05..bb78c11559cd 100644
--- a/drivers/net/hamradio/baycom_epp.c
+++ b/drivers/net/hamradio/baycom_epp.c
@@ -203,7 +203,6 @@ struct baycom_state {
                 unsigned char buf[TXBUFFER_SIZE];
         } hdlctx;
 
-        struct net_device_stats stats;
         unsigned int ptt_keyed;
         struct sk_buff *skb;  /* next transmit packet  */
 
@@ -423,7 +422,7 @@ static void encode_hdlc(struct baycom_state *bc)
         bc->hdlctx.bufptr = bc->hdlctx.buf;
         bc->hdlctx.bufcnt = wp - bc->hdlctx.buf;
         dev_kfree_skb(skb);
-        bc->stats.tx_packets++;
+        bc->dev->stats.tx_packets++;
 }
 
 /* ---------------------------------------------------------------------- */
@@ -547,7 +546,7 @@ static void do_rxpacket(struct net_device *dev)
         pktlen = bc->hdlcrx.bufcnt-2+1; /* KISS kludge */
         if (!(skb = dev_alloc_skb(pktlen))) {
                 printk("%s: memory squeeze, dropping packet\n", dev->name);
-                bc->stats.rx_dropped++;
+                dev->stats.rx_dropped++;
                 return;
         }
         cp = skb_put(skb, pktlen);
@@ -555,7 +554,7 @@ static void do_rxpacket(struct net_device *dev)
         memcpy(cp, bc->hdlcrx.buf, pktlen - 1);
         skb->protocol = ax25_type_trans(skb, dev);
         netif_rx(skb);
-        bc->stats.rx_packets++;
+        dev->stats.rx_packets++;
 }
 
 static int receive(struct net_device *dev, int cnt)
@@ -802,19 +801,6 @@ static int baycom_set_mac_address(struct net_device *dev, void *addr)
 
 /* --------------------------------------------------------------------- */
 
-static struct net_device_stats *baycom_get_stats(struct net_device *dev)
-{
-        struct baycom_state *bc = netdev_priv(dev);
-
-        /* 
-         * Get the current statistics.  This may be called with the
-         * card open or closed. 
-         */
-        return &bc->stats;
-}
-
-/* --------------------------------------------------------------------- */
-
 static void epp_wakeup(void *handle)
 {
         struct net_device *dev = (struct net_device *)handle;
@@ -1065,10 +1051,10 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                 hi.data.cs.ptt = !!(bc->stat & EPP_PTTBIT);
                 hi.data.cs.dcd = !(bc->stat & EPP_DCDBIT);
                 hi.data.cs.ptt_keyed = bc->ptt_keyed;
-                hi.data.cs.tx_packets = bc->stats.tx_packets;
-                hi.data.cs.tx_errors = bc->stats.tx_errors;
-                hi.data.cs.rx_packets = bc->stats.rx_packets;
-                hi.data.cs.rx_errors = bc->stats.rx_errors;
+                hi.data.cs.tx_packets = dev->stats.tx_packets;
+                hi.data.cs.tx_errors = dev->stats.tx_errors;
+                hi.data.cs.rx_packets = dev->stats.rx_packets;
+                hi.data.cs.rx_errors = dev->stats.rx_errors;
                 break;          
 
         case HDLCDRVCTL_OLDGETSTAT:
@@ -1116,6 +1102,14 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 
 /* --------------------------------------------------------------------- */
 
+static const struct net_device_ops baycom_netdev_ops = {
+        .ndo_open            = epp_open,
+        .ndo_stop            = epp_close,
+        .ndo_do_ioctl        = baycom_ioctl,
+        .ndo_start_xmit      = baycom_send_packet,
+        .ndo_set_mac_address = baycom_set_mac_address,
+};
+
 /*
  * Check for a network adaptor of this type, and return '0' if one exists.
  * If dev->base_addr == 0, probe all likely locations.
@@ -1143,17 +1137,12 @@ static void baycom_probe(struct net_device *dev)
         /*
          * initialize the device struct
          */
-        dev->open = epp_open;
-        dev->stop = epp_close;
-        dev->do_ioctl = baycom_ioctl;
-        dev->hard_start_xmit = baycom_send_packet;
-        dev->get_stats = baycom_get_stats;
 
         /* Fill in the fields of the device structure */
         bc->skb = NULL;
         
+        dev->netdev_ops = &baycom_netdev_ops;
         dev->header_ops = &ax25_header_ops;
-        dev->set_mac_address = baycom_set_mac_address;
         
         dev->type = ARPHRD_AX25;           /* AF_AX25 device */
         dev->hard_header_len = AX25_MAX_HEADER_LEN + AX25_BPQ_HEADER_LEN;
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index 46f8f3390e7d..2c619bc99ae7 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -97,7 +97,7 @@ static int bpq_rcv(struct sk_buff *, struct net_device *, struct packet_type *,
 static int bpq_device_event(struct notifier_block *, unsigned long, void *);
 
 static struct packet_type bpq_packet_type = {
-        .type   = __constant_htons(ETH_P_BPQ),
+        .type   = cpu_to_be16(ETH_P_BPQ),
         .func   = bpq_rcv,
 };
 
@@ -110,7 +110,6 @@ struct bpqdev {
         struct list_head bpq_list;      /* list of bpq devices chain */
         struct net_device *ethdev;      /* link to ethernet device */
         struct net_device *axdev;       /* bpq device (bpq#) */
-        struct net_device_stats stats;  /* some statistics */
         char   dest_addr[6];            /* ether destination address */
         char   acpt_addr[6];            /* accept ether frames from this address only */
 };
@@ -222,8 +221,8 @@ static int bpq_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_ty
         skb_pull(skb, 2);       /* Remove the length bytes */
         skb_trim(skb, len);     /* Set the length of the data */
 
-        bpq->stats.rx_packets++;
-        bpq->stats.rx_bytes += len;
+        dev->stats.rx_packets++;
+        dev->stats.rx_bytes += len;
 
         ptr = skb_push(skb, 1);
         *ptr = 0;
@@ -292,7 +291,7 @@ static int bpq_xmit(struct sk_buff *skb, struct net_device *dev)
         bpq = netdev_priv(dev);
 
         if ((dev = bpq_get_ether_dev(dev)) == NULL) {
-                bpq->stats.tx_dropped++;
+                dev->stats.tx_dropped++;
                 kfree_skb(skb);
                 return -ENODEV;
         }
@@ -300,8 +299,8 @@ static int bpq_xmit(struct sk_buff *skb, struct net_device *dev)
         skb->protocol = ax25_type_trans(skb, dev);
         skb_reset_network_header(skb);
         dev_hard_header(skb, dev, ETH_P_BPQ, bpq->dest_addr, NULL, 0);
-        bpq->stats.tx_packets++;
-        bpq->stats.tx_bytes+=skb->len;
+        dev->stats.tx_packets++;
+        dev->stats.tx_bytes+=skb->len;
   
         dev_queue_xmit(skb);
         netif_wake_queue(dev);
@@ -309,16 +308,6 @@ static int bpq_xmit(struct sk_buff *skb, struct net_device *dev)
 }
 
 /*
- *      Statistics
- */
-static struct net_device_stats *bpq_get_stats(struct net_device *dev)
-{
-        struct bpqdev *bpq = netdev_priv(dev);
-
-        return &bpq->stats;
-}
-
-/*
  *      Set AX.25 callsign
  */
 static int bpq_set_mac_address(struct net_device *dev, void *addr)
@@ -454,7 +443,7 @@ static int bpq_seq_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static struct seq_operations bpq_seqops = {
+static const struct seq_operations bpq_seqops = {
         .start = bpq_seq_start,
         .next = bpq_seq_next,
         .stop = bpq_seq_stop,
@@ -477,16 +466,17 @@ static const struct file_operations bpq_info_fops = {
 
 /* ------------------------------------------------------------------------ */
 
+static const struct net_device_ops bpq_netdev_ops = {
+        .ndo_open            = bpq_open,
+        .ndo_stop            = bpq_close,
+        .ndo_start_xmit      = bpq_xmit,
+        .ndo_set_mac_address = bpq_set_mac_address,
+        .ndo_do_ioctl        = bpq_ioctl,
+};
 
 static void bpq_setup(struct net_device *dev)
 {
-
-        dev->hard_start_xmit = bpq_xmit;
-        dev->open            = bpq_open;
-        dev->stop            = bpq_close;
-        dev->set_mac_address = bpq_set_mac_address;
-        dev->get_stats       = bpq_get_stats;
-        dev->do_ioctl        = bpq_ioctl;
+        dev->netdev_ops      = &bpq_netdev_ops;
         dev->destructor      = free_netdev;
 
         memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);
diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c
index e67103396ed7..881bf818bb48 100644
--- a/drivers/net/hamradio/dmascc.c
+++ b/drivers/net/hamradio/dmascc.c
@@ -195,7 +195,7 @@ struct scc_priv {
         int chip;
         struct net_device *dev;
         struct scc_info *info;
-        struct net_device_stats stats;
+
         int channel;
         int card_base, scc_cmd, scc_data;
         int tmr_cnt, tmr_ctrl, tmr_mode;
@@ -239,7 +239,6 @@ static int scc_open(struct net_device *dev);
 static int scc_close(struct net_device *dev);
 static int scc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
 static int scc_send_packet(struct sk_buff *skb, struct net_device *dev);
-static struct net_device_stats *scc_get_stats(struct net_device *dev);
 static int scc_set_mac_address(struct net_device *dev, void *sa);
 
 static inline void tx_on(struct scc_priv *priv);
@@ -441,6 +440,13 @@ static void __init dev_setup(struct net_device *dev)
         memcpy(dev->dev_addr, &ax25_defaddr, AX25_ADDR_LEN);
 }
 
+static const struct net_device_ops scc_netdev_ops = {
+        .ndo_open = scc_open,
+        .ndo_stop = scc_close,
+        .ndo_start_xmit = scc_send_packet,
+        .ndo_do_ioctl = scc_ioctl,
+};
+
 static int __init setup_adapter(int card_base, int type, int n)
 {
         int i, irq, chip;
@@ -576,11 +582,7 @@ static int __init setup_adapter(int card_base, int type, int n)
                 sprintf(dev->name, "dmascc%i", 2 * n + i);
                 dev->base_addr = card_base;
                 dev->irq = irq;
-                dev->open = scc_open;
-                dev->stop = scc_close;
-                dev->do_ioctl = scc_ioctl;
-                dev->hard_start_xmit = scc_send_packet;
-                dev->get_stats = scc_get_stats;
+                dev->netdev_ops = &scc_netdev_ops;
                 dev->header_ops = &ax25_header_ops;
                 dev->set_mac_address = scc_set_mac_address;
         }
@@ -961,14 +963,6 @@ static int scc_send_packet(struct sk_buff *skb, struct net_device *dev)
 }
 
 
-static struct net_device_stats *scc_get_stats(struct net_device *dev)
-{
-        struct scc_priv *priv = dev->ml_priv;
-
-        return &priv->stats;
-}
-
-
 static int scc_set_mac_address(struct net_device *dev, void *sa)
 {
         memcpy(dev->dev_addr, ((struct sockaddr *) sa)->sa_data,
@@ -1216,17 +1210,17 @@ static void special_condition(struct scc_priv *priv, int rc)
                 }
                 if (priv->rx_over) {
                         /* We had an overrun */
-                        priv->stats.rx_errors++;
+                        priv->dev->stats.rx_errors++;
                         if (priv->rx_over == 2)
-                                priv->stats.rx_length_errors++;
+                                priv->dev->stats.rx_length_errors++;
                         else
-                                priv->stats.rx_fifo_errors++;
+                                priv->dev->stats.rx_fifo_errors++;
                         priv->rx_over = 0;
                 } else if (rc & CRC_ERR) {
                         /* Count invalid CRC only if packet length >= minimum */
                         if (cb >= 15) {
-                                priv->stats.rx_errors++;
-                                priv->stats.rx_crc_errors++;
+                                priv->dev->stats.rx_errors++;
+                                priv->dev->stats.rx_crc_errors++;
                         }
                 } else {
                         if (cb >= 15) {
@@ -1239,8 +1233,8 @@ static void special_condition(struct scc_priv *priv, int rc)
                                         priv->rx_count++;
                                         schedule_work(&priv->rx_work);
                                 } else {
-                                        priv->stats.rx_errors++;
-                                        priv->stats.rx_over_errors++;
+                                        priv->dev->stats.rx_errors++;
+                                        priv->dev->stats.rx_over_errors++;
                                 }
                         }
                 }
@@ -1275,7 +1269,7 @@ static void rx_bh(struct work_struct *ugli_api)
                 skb = dev_alloc_skb(cb + 1);
                 if (skb == NULL) {
                         /* Drop packet */
-                        priv->stats.rx_dropped++;
+                        priv->dev->stats.rx_dropped++;
                 } else {
                         /* Fill buffer */
                         data = skb_put(skb, cb + 1);
@@ -1283,8 +1277,8 @@ static void rx_bh(struct work_struct *ugli_api)
                         memcpy(&data[1], priv->rx_buf[i], cb);
                         skb->protocol = ax25_type_trans(skb, priv->dev);
                         netif_rx(skb);
-                        priv->stats.rx_packets++;
-                        priv->stats.rx_bytes += cb;
+                        priv->dev->stats.rx_packets++;
+                        priv->dev->stats.rx_bytes += cb;
                 }
                 spin_lock_irqsave(&priv->ring_lock, flags);
                 /* Move tail */
@@ -1351,15 +1345,15 @@ static void es_isr(struct scc_priv *priv)
                         write_scc(priv, R1, EXT_INT_ENAB | WT_FN_RDYFN);
                 if (res) {
                         /* Update packet statistics */
-                        priv->stats.tx_errors++;
-                        priv->stats.tx_fifo_errors++;
+                        priv->dev->stats.tx_errors++;
+                        priv->dev->stats.tx_fifo_errors++;
                         /* Other underrun interrupts may already be waiting */
                         write_scc(priv, R0, RES_EXT_INT);
                         write_scc(priv, R0, RES_EXT_INT);
                 } else {
                         /* Update packet statistics */
-                        priv->stats.tx_packets++;
-                        priv->stats.tx_bytes += priv->tx_len[i];
+                        priv->dev->stats.tx_packets++;
+                        priv->dev->stats.tx_bytes += priv->tx_len[i];
                         /* Remove frame from FIFO */
                         priv->tx_tail = (i + 1) % NUM_TX_BUF;
                         priv->tx_count--;
@@ -1425,7 +1419,7 @@ static void tm_isr(struct scc_priv *priv)
                 write_scc(priv, R15, DCDIE);
                 priv->rr0 = read_scc(priv, R0);
                 if (priv->rr0 & DCD) {
-                        priv->stats.collisions++;
+                        priv->dev->stats.collisions++;
                         rx_on(priv);
                         priv->state = RX_ON;
                 } else {
diff --git a/drivers/net/hamradio/hdlcdrv.c b/drivers/net/hamradio/hdlcdrv.c
index 8eba61a1d4ab..61de56e45eed 100644
--- a/drivers/net/hamradio/hdlcdrv.c
+++ b/drivers/net/hamradio/hdlcdrv.c
@@ -154,7 +154,7 @@ static void hdlc_rx_flag(struct net_device *dev, struct hdlcdrv_state *s)
         pkt_len = s->hdlcrx.len - 2 + 1; /* KISS kludge */
         if (!(skb = dev_alloc_skb(pkt_len))) {
                 printk("%s: memory squeeze, dropping packet\n", dev->name);
-                s->stats.rx_dropped++;
+                dev->stats.rx_dropped++;
                 return;
         }
         cp = skb_put(skb, pkt_len);
@@ -162,7 +162,7 @@ static void hdlc_rx_flag(struct net_device *dev, struct hdlcdrv_state *s)
         memcpy(cp, s->hdlcrx.buffer, pkt_len - 1);
         skb->protocol = ax25_type_trans(skb, dev);
         netif_rx(skb);
-        s->stats.rx_packets++;
+        dev->stats.rx_packets++;
 }
 
 void hdlcdrv_receiver(struct net_device *dev, struct hdlcdrv_state *s)
@@ -326,7 +326,7 @@ void hdlcdrv_transmitter(struct net_device *dev, struct hdlcdrv_state *s)
                         s->hdlctx.len = pkt_len+2; /* the appended CRC */
                         s->hdlctx.tx_state = 2;
                         s->hdlctx.bitstream = 0;
-                        s->stats.tx_packets++;
+                        dev->stats.tx_packets++;
                         break;
                 case 2:
                         if (!s->hdlctx.len) {
@@ -427,19 +427,6 @@ static int hdlcdrv_set_mac_address(struct net_device *dev, void *addr)
 }
 
 /* --------------------------------------------------------------------- */
-
-static struct net_device_stats *hdlcdrv_get_stats(struct net_device *dev)
-{
-        struct hdlcdrv_state *sm = netdev_priv(dev);
-
-        /* 
-         * Get the current statistics.  This may be called with the
-         * card open or closed. 
-         */
-        return &sm->stats;
-}
-
-/* --------------------------------------------------------------------- */
 /*
  * Open/initialize the board. This is called (in the current kernel)
  * sometime after booting when the 'ifconfig' program is run.
@@ -568,10 +555,10 @@ static int hdlcdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                 bi.data.cs.ptt = hdlcdrv_ptt(s);
                 bi.data.cs.dcd = s->hdlcrx.dcd;
                 bi.data.cs.ptt_keyed = s->ptt_keyed;
-                bi.data.cs.tx_packets = s->stats.tx_packets;
-                bi.data.cs.tx_errors = s->stats.tx_errors;
-                bi.data.cs.rx_packets = s->stats.rx_packets;
-                bi.data.cs.rx_errors = s->stats.rx_errors;
+                bi.data.cs.tx_packets = dev->stats.tx_packets;
+                bi.data.cs.tx_errors = dev->stats.tx_errors;
+                bi.data.cs.rx_packets = dev->stats.rx_packets;
+                bi.data.cs.rx_errors = dev->stats.rx_errors;
                 break;          
 
         case HDLCDRVCTL_OLDGETSTAT:
@@ -630,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
  */
@@ -669,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;
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c
index bbdb311b8420..ed5b37d43334 100644
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -59,8 +59,6 @@ struct mkiss {
         unsigned char           *xhead; /* pointer to next byte to XMIT */
         int                     xleft;  /* bytes left in XMIT queue     */
 
-        struct net_device_stats stats;
-
         /* Detailed SLIP statistics. */
         int             mtu;            /* Our mtu (to spot changes!)   */
         int             buffsize;       /* Max buffers sizes            */
@@ -253,7 +251,7 @@ static void ax_bump(struct mkiss *ax)
         if (ax->rbuff[0] > 0x0f) {
                 if (ax->rbuff[0] & 0x80) {
                         if (check_crc_16(ax->rbuff, ax->rcount) < 0) {
-                                ax->stats.rx_errors++;
+                                ax->dev->stats.rx_errors++;
                                 spin_unlock_bh(&ax->buflock);
 
                                 return;
@@ -268,7 +266,7 @@ static void ax_bump(struct mkiss *ax)
                         *ax->rbuff &= ~0x80;
                 } else if (ax->rbuff[0] & 0x20)  {
                         if (check_crc_flex(ax->rbuff, ax->rcount) < 0) {
-                                ax->stats.rx_errors++;
+                                ax->dev->stats.rx_errors++;
                                 spin_unlock_bh(&ax->buflock);
                                 return;
                         }
@@ -295,7 +293,7 @@ static void ax_bump(struct mkiss *ax)
         if ((skb = dev_alloc_skb(count)) == NULL) {
                 printk(KERN_ERR "mkiss: %s: memory squeeze, dropping packet.\n",
                        ax->dev->name);
-                ax->stats.rx_dropped++;
+                ax->dev->stats.rx_dropped++;
                 spin_unlock_bh(&ax->buflock);
                 return;
         }
@@ -303,8 +301,8 @@ static void ax_bump(struct mkiss *ax)
         memcpy(skb_put(skb,count), ax->rbuff, count);
         skb->protocol = ax25_type_trans(skb, ax->dev);
         netif_rx(skb);
-        ax->stats.rx_packets++;
-        ax->stats.rx_bytes += count;
+        ax->dev->stats.rx_packets++;
+        ax->dev->stats.rx_bytes += count;
         spin_unlock_bh(&ax->buflock);
 }
 
@@ -344,7 +342,7 @@ static void kiss_unesc(struct mkiss *ax, unsigned char s)
                         return;
                 }
 
-                ax->stats.rx_over_errors++;
+                ax->dev->stats.rx_over_errors++;
                 set_bit(AXF_ERROR, &ax->flags);
         }
         spin_unlock_bh(&ax->buflock);
@@ -406,7 +404,7 @@ static void ax_changedmtu(struct mkiss *ax)
                         memcpy(ax->xbuff, ax->xhead, ax->xleft);
                 } else  {
                         ax->xleft = 0;
-                        ax->stats.tx_dropped++;
+                        dev->stats.tx_dropped++;
                 }
         }
 
@@ -417,7 +415,7 @@ static void ax_changedmtu(struct mkiss *ax)
                         memcpy(ax->rbuff, orbuff, ax->rcount);
                 } else  {
                         ax->rcount = 0;
-                        ax->stats.rx_over_errors++;
+                        dev->stats.rx_over_errors++;
                         set_bit(AXF_ERROR, &ax->flags);
                 }
         }
@@ -444,7 +442,7 @@ static void ax_encaps(struct net_device *dev, unsigned char *icp, int len)
         if (len > ax->mtu) {            /* Sigh, shouldn't occur BUT ... */
                 len = ax->mtu;
                 printk(KERN_ERR "mkiss: %s: truncating oversized transmit packet!\n", ax->dev->name);
-                ax->stats.tx_dropped++;
+                dev->stats.tx_dropped++;
                 netif_start_queue(dev);
                 return;
         }
@@ -518,8 +516,8 @@ static void ax_encaps(struct net_device *dev, unsigned char *icp, int len)
 
         set_bit(TTY_DO_WRITE_WAKEUP, &ax->tty->flags);
         actual = ax->tty->ops->write(ax->tty, ax->xbuff, count);
-        ax->stats.tx_packets++;
-        ax->stats.tx_bytes += actual;
+        dev->stats.tx_packets++;
+        dev->stats.tx_bytes += actual;
 
         ax->dev->trans_start = jiffies;
         ax->xleft = count - actual;
@@ -664,32 +662,28 @@ static int ax_close(struct net_device *dev)
         return 0;
 }
 
-static struct net_device_stats *ax_get_stats(struct net_device *dev)
-{
-        struct mkiss *ax = netdev_priv(dev);
-
-        return &ax->stats;
-}
-
 static const struct header_ops ax_header_ops = {
         .create    = ax_header,
         .rebuild   = ax_rebuild_header,
 };
 
+static const struct net_device_ops ax_netdev_ops = {
+        .ndo_open            = ax_open_dev,
+        .ndo_stop            = ax_close,
+        .ndo_start_xmit      = ax_xmit,
+        .ndo_set_mac_address = ax_set_mac_address,
+};
+
 static void ax_setup(struct net_device *dev)
 {
         /* Finish setting up the DEVICE info. */
         dev->mtu             = AX_MTU;
-        dev->hard_start_xmit = ax_xmit;
-        dev->open            = ax_open_dev;
-        dev->stop            = ax_close;
-        dev->get_stats       = ax_get_stats;
-        dev->set_mac_address = ax_set_mac_address;
         dev->hard_header_len = 0;
         dev->addr_len        = 0;
         dev->type            = ARPHRD_AX25;
         dev->tx_queue_len    = 10;
         dev->header_ops      = &ax_header_ops;
+        dev->netdev_ops      = &ax_netdev_ops;
 
 
         memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);
@@ -929,7 +923,7 @@ static void mkiss_receive_buf(struct tty_struct *tty, const unsigned char *cp,
         while (count--) {
                 if (fp != NULL && *fp++) {
                         if (!test_and_set_bit(AXF_ERROR, &ax->flags))
-                                ax->stats.rx_errors++;
+                                ax->dev->stats.rx_errors++;
                         cp++;
                         continue;
                 }
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c
index c011af7088ea..2acb18f06972 100644
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -1542,23 +1542,24 @@ static int scc_net_alloc(const char *name, struct scc_channel *scc)
 /* *                        Network driver methods                    * */
 /* ******************************************************************** */
 
+static const struct net_device_ops scc_netdev_ops = {
+        .ndo_open            = scc_net_open,
+        .ndo_stop            = scc_net_close,
+        .ndo_start_xmit      = scc_net_tx,
+        .ndo_set_mac_address = scc_net_set_mac_address,
+        .ndo_get_stats       = scc_net_get_stats,
+        .ndo_do_ioctl        = scc_net_ioctl,
+};
+
 /* ----> Initialize device <----- */
 
 static void scc_net_setup(struct net_device *dev)
 {
         dev->tx_queue_len    = 16;      /* should be enough... */
 
-        dev->open            = scc_net_open;
-        dev->stop            = scc_net_close;
-
-        dev->hard_start_xmit = scc_net_tx;
+        dev->netdev_ops      = &scc_netdev_ops;
         dev->header_ops      = &ax25_header_ops;
 
-        dev->set_mac_address = scc_net_set_mac_address;
-        dev->get_stats       = scc_net_get_stats;
-        dev->do_ioctl        = scc_net_ioctl;
-        dev->tx_timeout      = NULL;
-
         memcpy(dev->broadcast, &ax25_bcast,  AX25_ADDR_LEN);
         memcpy(dev->dev_addr,  &ax25_defaddr, AX25_ADDR_LEN);
  
@@ -2073,7 +2074,7 @@ static int scc_net_seq_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static struct seq_operations scc_net_seq_ops = {
+static const struct seq_operations scc_net_seq_ops = {
         .start  = scc_net_seq_start,
         .next   = scc_net_seq_next,
         .stop   = scc_net_seq_stop,
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c
index 5407f7486c9c..82a8be7613d6 100644
--- a/drivers/net/hamradio/yam.c
+++ b/drivers/net/hamradio/yam.c
@@ -115,10 +115,6 @@ struct yam_port {
 
         struct net_device *dev;
 
-        /* Stats section */
-
-        struct net_device_stats stats;
-
         int nb_rxint;
         int nb_mdint;
 
@@ -507,7 +503,7 @@ static inline void yam_rx_flag(struct net_device *dev, struct yam_port *yp)
                 } else {
                         if (!(skb = dev_alloc_skb(pkt_len))) {
                                 printk(KERN_WARNING "%s: memory squeeze, dropping packet\n", dev->name);
-                                ++yp->stats.rx_dropped;
+                                ++dev->stats.rx_dropped;
                         } else {
                                 unsigned char *cp;
                                 cp = skb_put(skb, pkt_len);
@@ -515,7 +511,7 @@ static inline void yam_rx_flag(struct net_device *dev, struct yam_port *yp)
                                 memcpy(cp, yp->rx_buf, pkt_len - 1);
                                 skb->protocol = ax25_type_trans(skb, dev);
                                 netif_rx(skb);
-                                ++yp->stats.rx_packets;
+                                ++dev->stats.rx_packets;
                         }
                 }
         }
@@ -677,7 +673,7 @@ static void yam_tx_byte(struct net_device *dev, struct yam_port *yp)
                         yp->tx_count = 1;
                         yp->tx_state = TX_HEAD;
                 }
-                ++yp->stats.tx_packets;
+                ++dev->stats.tx_packets;
                 break;
         case TX_TAIL:
                 if (--yp->tx_count <= 0) {
@@ -716,7 +712,7 @@ static irqreturn_t yam_interrupt(int irq, void *dev_id)
                         handled = 1;
 
                         if (lsr & LSR_OE)
-                                ++yp->stats.rx_fifo_errors;
+                                ++dev->stats.rx_fifo_errors;
 
                         yp->dcd = (msr & RX_DCD) ? 1 : 0;
 
@@ -778,16 +774,16 @@ static int yam_seq_show(struct seq_file *seq, void *v)
         seq_printf(seq, "  TxTail   %u\n", yp->txtail);
         seq_printf(seq, "  SlotTime %u\n", yp->slot);
         seq_printf(seq, "  Persist  %u\n", yp->pers);
-        seq_printf(seq, "  TxFrames %lu\n", yp->stats.tx_packets);
-        seq_printf(seq, "  RxFrames %lu\n", yp->stats.rx_packets);
+        seq_printf(seq, "  TxFrames %lu\n", dev->stats.tx_packets);
+        seq_printf(seq, "  RxFrames %lu\n", dev->stats.rx_packets);
         seq_printf(seq, "  TxInt    %u\n", yp->nb_mdint);
         seq_printf(seq, "  RxInt    %u\n", yp->nb_rxint);
-        seq_printf(seq, "  RxOver   %lu\n", yp->stats.rx_fifo_errors);
+        seq_printf(seq, "  RxOver   %lu\n", dev->stats.rx_fifo_errors);
         seq_printf(seq, "\n");
         return 0;
 }
 
-static struct seq_operations yam_seqops = {
+static const struct seq_operations yam_seqops = {
         .start = yam_seq_start,
         .next = yam_seq_next,
         .stop = yam_seq_stop,
@@ -812,26 +808,6 @@ static const struct file_operations yam_info_fops = {
 
 /* --------------------------------------------------------------------- */
 
-static struct net_device_stats *yam_get_stats(struct net_device *dev)
-{
-        struct yam_port *yp;
-
-        if (!dev)
-                return NULL;
-
-        yp = netdev_priv(dev);
-        if (yp->magic != YAM_MAGIC)
-                return NULL;
-
-        /* 
-         * Get the current statistics.  This may be called with the
-         * card open or closed. 
-         */
-        return &yp->stats;
-}
-
-/* --------------------------------------------------------------------- */
-
 static int yam_open(struct net_device *dev)
 {
         struct yam_port *yp = netdev_priv(dev);
@@ -878,9 +854,9 @@ static int yam_open(struct net_device *dev)
         /* Reset overruns for all ports - FPGA programming makes overruns */
         for (i = 0; i < NR_PORTS; i++) {
                 struct net_device *dev = yam_devs[i];
-                struct yam_port *yp = netdev_priv(dev);
+
                 inb(LSR(dev->base_addr));
-                yp->stats.rx_fifo_errors = 0;
+                dev->stats.rx_fifo_errors = 0;
         }
 
         printk(KERN_INFO "%s at iobase 0x%lx irq %u uart %s\n", dev->name, dev->base_addr, dev->irq,
@@ -1068,6 +1044,14 @@ static int yam_set_mac_address(struct net_device *dev, void *addr)
 
 /* --------------------------------------------------------------------- */
 
+static const struct net_device_ops yam_netdev_ops = {
+        .ndo_open            = yam_open,
+        .ndo_stop            = yam_close,
+        .ndo_start_xmit      = yam_send_packet,
+        .ndo_do_ioctl        = yam_ioctl,
+        .ndo_set_mac_address = yam_set_mac_address,
+};
+
 static void yam_setup(struct net_device *dev)
 {
         struct yam_port *yp = netdev_priv(dev);
@@ -1088,18 +1072,11 @@ static void yam_setup(struct net_device *dev)
         dev->base_addr = yp->iobase;
         dev->irq = yp->irq;
 
-        dev->open = yam_open;
-        dev->stop = yam_close;
-        dev->do_ioctl = yam_ioctl;
-        dev->hard_start_xmit = yam_send_packet;
-        dev->get_stats = yam_get_stats;
-
         skb_queue_head_init(&yp->send_queue);
 
+        dev->netdev_ops = &yam_netdev_ops;
         dev->header_ops = &ax25_header_ops;
 
-        dev->set_mac_address = yam_set_mac_address;
-
         dev->type = ARPHRD_AX25;
         dev->hard_header_len = AX25_MAX_HEADER_LEN;
         dev->mtu = AX25_MTU;