6 files changed, 91 insertions, 110 deletions

diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index ea9438fc6855..334fcd4a4ea4 100644
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -83,7 +83,6 @@ struct br2684_dev {
         struct list_head br2684_devs;
         int number;
         struct list_head brvccs;        /* one device <=> one vcc (before xmas) */
-        struct net_device_stats stats;
         int mac_was_set;
         enum br2684_payload payload;
 };
@@ -148,9 +147,10 @@ static struct net_device *br2684_find_dev(const struct br2684_if_spec *s)
  * the way for multiple vcc's per itf.  Returns true if we can send,
  * otherwise false
  */
-static int br2684_xmit_vcc(struct sk_buff *skb, struct br2684_dev *brdev,
+static int br2684_xmit_vcc(struct sk_buff *skb, struct net_device *dev,
                            struct br2684_vcc *brvcc)
 {
+        struct br2684_dev *brdev = BRPRIV(dev);
         struct atm_vcc *atmvcc;
         int minheadroom = (brvcc->encaps == e_llc) ? 10 : 2;
 
@@ -211,8 +211,8 @@ static int br2684_xmit_vcc(struct sk_buff *skb, struct br2684_dev *brdev,
         }
         atomic_add(skb->truesize, &sk_atm(atmvcc)->sk_wmem_alloc);
         ATM_SKB(skb)->atm_options = atmvcc->atm_options;
-        brdev->stats.tx_packets++;
-        brdev->stats.tx_bytes += skb->len;
+        dev->stats.tx_packets++;
+        dev->stats.tx_bytes += skb->len;
         atmvcc->send(atmvcc, skb);
         return 1;
 }
@@ -233,14 +233,14 @@ static int br2684_start_xmit(struct sk_buff *skb, struct net_device *dev)
         brvcc = pick_outgoing_vcc(skb, brdev);
         if (brvcc == NULL) {
                 pr_debug("no vcc attached to dev %s\n", dev->name);
-                brdev->stats.tx_errors++;
-                brdev->stats.tx_carrier_errors++;
+                dev->stats.tx_errors++;
+                dev->stats.tx_carrier_errors++;
                 /* netif_stop_queue(dev); */
                 dev_kfree_skb(skb);
                 read_unlock(&devs_lock);
                 return 0;
         }
-        if (!br2684_xmit_vcc(skb, brdev, brvcc)) {
+        if (!br2684_xmit_vcc(skb, dev, brvcc)) {
                 /*
                  * We should probably use netif_*_queue() here, but that
                  * involves added complication.  We need to walk before
@@ -248,27 +248,20 @@ static int br2684_start_xmit(struct sk_buff *skb, struct net_device *dev)
                  *
                  * Don't free here! this pointer might be no longer valid!
                  */
-                brdev->stats.tx_errors++;
-                brdev->stats.tx_fifo_errors++;
+                dev->stats.tx_errors++;
+                dev->stats.tx_fifo_errors++;
         }
         read_unlock(&devs_lock);
         return 0;
 }
 
-static struct net_device_stats *br2684_get_stats(struct net_device *dev)
-{
-        pr_debug("br2684_get_stats\n");
-        return &BRPRIV(dev)->stats;
-}
-
 /*
  * We remember when the MAC gets set, so we don't override it later with
  * the ESI of the ATM card of the first VC
  */
-static int (*my_eth_mac_addr) (struct net_device *, void *);
 static int br2684_mac_addr(struct net_device *dev, void *p)
 {
-        int err = my_eth_mac_addr(dev, p);
+        int err = eth_mac_addr(dev, p);
         if (!err)
                 BRPRIV(dev)->mac_was_set = 1;
         return err;
@@ -430,17 +423,17 @@ static void br2684_push(struct atm_vcc *atmvcc, struct sk_buff *skb)
         /* sigh, interface is down? */
         if (unlikely(!(net_dev->flags & IFF_UP)))
                 goto dropped;
-        brdev->stats.rx_packets++;
-        brdev->stats.rx_bytes += skb->len;
+        net_dev->stats.rx_packets++;
+        net_dev->stats.rx_bytes += skb->len;
         memset(ATM_SKB(skb), 0, sizeof(struct atm_skb_data));
         netif_rx(skb);
         return;
 
 dropped:
-        brdev->stats.rx_dropped++;
+        net_dev->stats.rx_dropped++;
         goto free_skb;
 error:
-        brdev->stats.rx_errors++;
+        net_dev->stats.rx_errors++;
 free_skb:
         dev_kfree_skb(skb);
         return;
@@ -531,8 +524,8 @@ static int br2684_regvcc(struct atm_vcc *atmvcc, void __user * arg)
 
                 skb->next = skb->prev = NULL;
                 br2684_push(atmvcc, skb);
-                BRPRIV(skb->dev)->stats.rx_bytes -= skb->len;
-                BRPRIV(skb->dev)->stats.rx_packets--;
+                skb->dev->stats.rx_bytes -= skb->len;
+                skb->dev->stats.rx_packets--;
 
                 skb = next;
         }
@@ -544,17 +537,20 @@ static int br2684_regvcc(struct atm_vcc *atmvcc, void __user * arg)
         return err;
 }
 
+static const struct net_device_ops br2684_netdev_ops = {
+        .ndo_start_xmit         = br2684_start_xmit,
+        .ndo_set_mac_address    = br2684_mac_addr,
+        .ndo_change_mtu         = eth_change_mtu,
+        .ndo_validate_addr      = eth_validate_addr,
+};
+
 static void br2684_setup(struct net_device *netdev)
 {
         struct br2684_dev *brdev = BRPRIV(netdev);
 
         ether_setup(netdev);
-        brdev->net_dev = netdev;
 
-        my_eth_mac_addr = netdev->set_mac_address;
-        netdev->set_mac_address = br2684_mac_addr;
-        netdev->hard_start_xmit = br2684_start_xmit;
-        netdev->get_stats = br2684_get_stats;
+        netdev->netdev_ops = &br2684_netdev_ops;
 
         INIT_LIST_HEAD(&brdev->brvccs);
 }
@@ -565,10 +561,8 @@ static void br2684_setup_routed(struct net_device *netdev)
         brdev->net_dev = netdev;
 
         netdev->hard_header_len = 0;
-        my_eth_mac_addr = netdev->set_mac_address;
-        netdev->set_mac_address = br2684_mac_addr;
-        netdev->hard_start_xmit = br2684_start_xmit;
-        netdev->get_stats = br2684_get_stats;
+
+        netdev->netdev_ops = &br2684_netdev_ops;
         netdev->addr_len = 0;
         netdev->mtu = 1500;
         netdev->type = ARPHRD_PPP;
diff --git a/net/atm/clip.c b/net/atm/clip.c
index 2d33a83be799..3dc0a3a42a57 100644
--- a/net/atm/clip.c
+++ b/net/atm/clip.c
@@ -214,15 +214,15 @@ static void clip_push(struct atm_vcc *vcc, struct sk_buff *skb)
                 skb->protocol = ((__be16 *) skb->data)[3];
                 skb_pull(skb, RFC1483LLC_LEN);
                 if (skb->protocol == htons(ETH_P_ARP)) {
-                        PRIV(skb->dev)->stats.rx_packets++;
-                        PRIV(skb->dev)->stats.rx_bytes += skb->len;
+                        skb->dev->stats.rx_packets++;
+                        skb->dev->stats.rx_bytes += skb->len;
                         clip_arp_rcv(skb);
                         return;
                 }
         }
         clip_vcc->last_use = jiffies;
-        PRIV(skb->dev)->stats.rx_packets++;
-        PRIV(skb->dev)->stats.rx_bytes += skb->len;
+        skb->dev->stats.rx_packets++;
+        skb->dev->stats.rx_bytes += skb->len;
         memset(ATM_SKB(skb), 0, sizeof(struct atm_skb_data));
         netif_rx(skb);
 }
@@ -372,7 +372,7 @@ static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev)
         if (!skb->dst) {
                 printk(KERN_ERR "clip_start_xmit: skb->dst == NULL\n");
                 dev_kfree_skb(skb);
-                clip_priv->stats.tx_dropped++;
+                dev->stats.tx_dropped++;
                 return 0;
         }
         if (!skb->dst->neighbour) {
@@ -380,13 +380,13 @@ static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 skb->dst->neighbour = clip_find_neighbour(skb->dst, 1);
                 if (!skb->dst->neighbour) {
                         dev_kfree_skb(skb);     /* lost that one */
-                        clip_priv->stats.tx_dropped++;
+                        dev->stats.tx_dropped++;
                         return 0;
                 }
 #endif
                 printk(KERN_ERR "clip_start_xmit: NO NEIGHBOUR !\n");
                 dev_kfree_skb(skb);
-                clip_priv->stats.tx_dropped++;
+                dev->stats.tx_dropped++;
                 return 0;
         }
         entry = NEIGH2ENTRY(skb->dst->neighbour);
@@ -400,7 +400,7 @@ static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev)
                         skb_queue_tail(&entry->neigh->arp_queue, skb);
                 else {
                         dev_kfree_skb(skb);
-                        clip_priv->stats.tx_dropped++;
+                        dev->stats.tx_dropped++;
                 }
                 return 0;
         }
@@ -423,8 +423,8 @@ static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 printk(KERN_WARNING "clip_start_xmit: XOFF->XOFF transition\n");
                 return 0;
         }
-        clip_priv->stats.tx_packets++;
-        clip_priv->stats.tx_bytes += skb->len;
+        dev->stats.tx_packets++;
+        dev->stats.tx_bytes += skb->len;
         vcc->send(vcc, skb);
         if (atm_may_send(vcc, 0)) {
                 entry->vccs->xoff = 0;
@@ -443,11 +443,6 @@ static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev)
         return 0;
 }
 
-static struct net_device_stats *clip_get_stats(struct net_device *dev)
-{
-        return &PRIV(dev)->stats;
-}
-
 static int clip_mkip(struct atm_vcc *vcc, int timeout)
 {
         struct clip_vcc *clip_vcc;
@@ -501,8 +496,8 @@ static int clip_mkip(struct atm_vcc *vcc, int timeout)
 
                         skb_get(skb);
                         clip_push(vcc, skb);
-                        PRIV(skb->dev)->stats.rx_packets--;
-                        PRIV(skb->dev)->stats.rx_bytes -= len;
+                        skb->dev->stats.rx_packets--;
+                        skb->dev->stats.rx_bytes -= len;
                         kfree_skb(skb);
                 }
 
@@ -557,11 +552,13 @@ static int clip_setentry(struct atm_vcc *vcc, __be32 ip)
         return error;
 }
 
+static const struct net_device_ops clip_netdev_ops = {
+        .ndo_start_xmit = clip_start_xmit,
+};
+
 static void clip_setup(struct net_device *dev)
 {
-        dev->hard_start_xmit = clip_start_xmit;
-        /* sg_xmit ... */
-        dev->get_stats = clip_get_stats;
+        dev->netdev_ops = &clip_netdev_ops;
         dev->type = ARPHRD_ATM;
         dev->hard_header_len = RFC1483LLC_LEN;
         dev->mtu = RFC1626_MTU;
@@ -621,7 +618,7 @@ static int clip_device_event(struct notifier_block *this, unsigned long event,
         }
 
         /* ignore non-CLIP devices */
-        if (dev->type != ARPHRD_ATM || dev->hard_start_xmit != clip_start_xmit)
+        if (dev->type != ARPHRD_ATM || dev->netdev_ops != &clip_netdev_ops)
                 return NOTIFY_DONE;
 
         switch (event) {
diff --git a/net/atm/lec.c b/net/atm/lec.c
index e5e301550e8a..199b6bb79f42 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -62,7 +62,6 @@ static unsigned char bridge_ula_lec[] = { 0x01, 0x80, 0xc2, 0x00, 0x00 };
 static int lec_open(struct net_device *dev);
 static int lec_start_xmit(struct sk_buff *skb, struct net_device *dev);
 static int lec_close(struct net_device *dev);
-static struct net_device_stats *lec_get_stats(struct net_device *dev);
 static void lec_init(struct net_device *dev);
 static struct lec_arp_table *lec_arp_find(struct lec_priv *priv,
                                           const unsigned char *mac_addr);
@@ -218,28 +217,28 @@ static unsigned char *get_tr_dst(unsigned char *packet, unsigned char *rdesc)
 
 static int lec_open(struct net_device *dev)
 {
-        struct lec_priv *priv = netdev_priv(dev);
-
         netif_start_queue(dev);
-        memset(&priv->stats, 0, sizeof(struct net_device_stats));
+        memset(&dev->stats, 0, sizeof(struct net_device_stats));
 
         return 0;
 }
 
-static __inline__ void
-lec_send(struct atm_vcc *vcc, struct sk_buff *skb, struct lec_priv *priv)
+static void
+lec_send(struct atm_vcc *vcc, struct sk_buff *skb)
 {
+        struct net_device *dev = skb->dev;
+
         ATM_SKB(skb)->vcc = vcc;
         ATM_SKB(skb)->atm_options = vcc->atm_options;
 
         atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
         if (vcc->send(vcc, skb) < 0) {
-                priv->stats.tx_dropped++;
+                dev->stats.tx_dropped++;
                 return;
         }
 
-        priv->stats.tx_packets++;
-        priv->stats.tx_bytes += skb->len;
+        dev->stats.tx_packets++;
+        dev->stats.tx_bytes += skb->len;
 }
 
 static void lec_tx_timeout(struct net_device *dev)
@@ -270,7 +269,7 @@ static int lec_start_xmit(struct sk_buff *skb, struct net_device *dev)
         pr_debug("lec_start_xmit called\n");
         if (!priv->lecd) {
                 printk("%s:No lecd attached\n", dev->name);
-                priv->stats.tx_errors++;
+                dev->stats.tx_errors++;
                 netif_stop_queue(dev);
                 return -EUNATCH;
         }
@@ -345,7 +344,7 @@ static int lec_start_xmit(struct sk_buff *skb, struct net_device *dev)
                                                GFP_ATOMIC);
                         dev_kfree_skb(skb);
                         if (skb2 == NULL) {
-                                priv->stats.tx_dropped++;
+                                dev->stats.tx_dropped++;
                                 return 0;
                         }
                         skb = skb2;
@@ -380,7 +379,7 @@ static int lec_start_xmit(struct sk_buff *skb, struct net_device *dev)
                             ("%s:lec_start_xmit: tx queue full or no arp entry, dropping, ",
                              dev->name);
                         pr_debug("MAC address %pM\n", lec_h->h_dest);
-                        priv->stats.tx_dropped++;
+                        dev->stats.tx_dropped++;
                         dev_kfree_skb(skb);
                 }
                 goto out;
@@ -392,10 +391,10 @@ static int lec_start_xmit(struct sk_buff *skb, struct net_device *dev)
         while (entry && (skb2 = skb_dequeue(&entry->tx_wait))) {
                 pr_debug("lec.c: emptying tx queue, ");
                 pr_debug("MAC address %pM\n", lec_h->h_dest);
-                lec_send(vcc, skb2, priv);
+                lec_send(vcc, skb2);
         }
 
-        lec_send(vcc, skb, priv);
+        lec_send(vcc, skb);
 
         if (!atm_may_send(vcc, 0)) {
                 struct lec_vcc_priv *vpriv = LEC_VCC_PRIV(vcc);
@@ -427,15 +426,6 @@ static int lec_close(struct net_device *dev)
         return 0;
 }
 
-/*
- * Get the current statistics.
- * This may be called with the card open or closed.
- */
-static struct net_device_stats *lec_get_stats(struct net_device *dev)
-{
-        return &((struct lec_priv *)netdev_priv(dev))->stats;
-}
-
 static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)
 {
         unsigned long flags;
@@ -512,7 +502,7 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)
                 priv->lane2_ops = NULL;
                 if (priv->lane_version > 1)
                         priv->lane2_ops = &lane2_ops;
-                if (dev->change_mtu(dev, mesg->content.config.mtu))
+                if (dev_set_mtu(dev, mesg->content.config.mtu))
                         printk("%s: change_mtu to %d failed\n", dev->name,
                                mesg->content.config.mtu);
                 priv->is_proxy = mesg->content.config.is_proxy;
@@ -677,17 +667,19 @@ static void lec_set_multicast_list(struct net_device *dev)
         return;
 }
 
+static const struct net_device_ops lec_netdev_ops = {
+        .ndo_open               = lec_open,
+        .ndo_stop               = lec_close,
+        .ndo_start_xmit         = lec_start_xmit,
+        .ndo_change_mtu         = lec_change_mtu,
+        .ndo_tx_timeout         = lec_tx_timeout,
+        .ndo_set_multicast_list = lec_set_multicast_list,
+};
+
+
 static void lec_init(struct net_device *dev)
 {
-        dev->change_mtu = lec_change_mtu;
-        dev->open = lec_open;
-        dev->stop = lec_close;
-        dev->hard_start_xmit = lec_start_xmit;
-        dev->tx_timeout = lec_tx_timeout;
-
-        dev->get_stats = lec_get_stats;
-        dev->set_multicast_list = lec_set_multicast_list;
-        dev->do_ioctl = NULL;
+        dev->netdev_ops = &lec_netdev_ops;
         printk("%s: Initialized!\n", dev->name);
 }
 
@@ -810,8 +802,8 @@ static void lec_push(struct atm_vcc *vcc, struct sk_buff *skb)
                 else
 #endif
                         skb->protocol = eth_type_trans(skb, dev);
-                priv->stats.rx_packets++;
-                priv->stats.rx_bytes += skb->len;
+                dev->stats.rx_packets++;
+                dev->stats.rx_bytes += skb->len;
                 memset(ATM_SKB(skb), 0, sizeof(struct atm_skb_data));
                 netif_rx(skb);
         }
@@ -1887,7 +1879,7 @@ restart:
                                         lec_arp_hold(entry);
                                         spin_unlock_irqrestore(&priv->lec_arp_lock, flags);
                                         while ((skb = skb_dequeue(&entry->tx_wait)) != NULL)
-                                                lec_send(vcc, skb, entry->priv);
+                                                lec_send(vcc, skb);
                                         entry->last_used = jiffies;
                                         entry->status = ESI_FORWARD_DIRECT;
                                         lec_arp_put(entry);
@@ -2305,7 +2297,7 @@ restart:
                                 lec_arp_hold(entry);
                                 spin_unlock_irqrestore(&priv->lec_arp_lock, flags);
                                 while ((skb = skb_dequeue(&entry->tx_wait)) != NULL)
-                                        lec_send(vcc, skb, entry->priv);
+                                        lec_send(vcc, skb);
                                 entry->last_used = jiffies;
                                 entry->status = ESI_FORWARD_DIRECT;
                                 lec_arp_put(entry);
diff --git a/net/atm/lec.h b/net/atm/lec.h
index 0d376682c1a3..9d14d196cc1d 100644
--- a/net/atm/lec.h
+++ b/net/atm/lec.h
@@ -69,7 +69,6 @@ struct lane2_ops {
 #define LEC_ARP_TABLE_SIZE 16
 
 struct lec_priv {
-        struct net_device_stats stats;
         unsigned short lecid;                   /* Lecid of this client */
         struct hlist_head lec_arp_empty_ones;
                                                 /* Used for storing VCC's that don't have a MAC address attached yet */
diff --git a/net/atm/mpc.c b/net/atm/mpc.c
index 039d5cc72c3d..e5bf11453a18 100644
--- a/net/atm/mpc.c
+++ b/net/atm/mpc.c
@@ -286,33 +286,32 @@ static void start_mpc(struct mpoa_client *mpc, struct net_device *dev)
 {
 
         dprintk("mpoa: (%s) start_mpc:\n", mpc->dev->name);
-        if (dev->hard_start_xmit == NULL) {
-                printk("mpoa: (%s) start_mpc: dev->hard_start_xmit == NULL, not starting\n",
-                       dev->name);
-                return;
+        if (!dev->netdev_ops)
+                printk("mpoa: (%s) start_mpc  not starting\n", dev->name);
+        else {
+                mpc->old_ops = dev->netdev_ops;
+                mpc->new_ops = *mpc->old_ops;
+                mpc->new_ops.ndo_start_xmit = mpc_send_packet;
+                dev->netdev_ops = &mpc->new_ops;
         }
-        mpc->old_hard_start_xmit = dev->hard_start_xmit;
-        dev->hard_start_xmit = mpc_send_packet;
-
-        return;
 }
 
 static void stop_mpc(struct mpoa_client *mpc)
 {
-
+        struct net_device *dev = mpc->dev;
         dprintk("mpoa: (%s) stop_mpc:", mpc->dev->name);
 
         /* Lets not nullify lec device's dev->hard_start_xmit */
-        if (mpc->dev->hard_start_xmit != mpc_send_packet) {
+        if (dev->netdev_ops != &mpc->new_ops) {
                 dprintk(" mpc already stopped, not fatal\n");
                 return;
         }
         dprintk("\n");
-        mpc->dev->hard_start_xmit = mpc->old_hard_start_xmit;
-        mpc->old_hard_start_xmit = NULL;
-        /* close_shortcuts(mpc);    ??? FIXME */
 
-        return;
+        dev->netdev_ops = mpc->old_ops;
+        mpc->old_ops = NULL;
+
+        /* close_shortcuts(mpc);    ??? FIXME */
 }
 
 static const char *mpoa_device_type_string(char type) __attribute__ ((unused));
@@ -531,7 +530,6 @@ static int send_via_shortcut(struct sk_buff *skb, struct mpoa_client *mpc)
  */
 static int mpc_send_packet(struct sk_buff *skb, struct net_device *dev)
 {
-        int retval;
         struct mpoa_client *mpc;
         struct ethhdr *eth;
         int i = 0;
@@ -561,9 +559,7 @@ static int mpc_send_packet(struct sk_buff *skb, struct net_device *dev)
         }
 
  non_ip:
-        retval = mpc->old_hard_start_xmit(skb,dev);
-
-        return retval;
+        return mpc->old_ops->ndo_start_xmit(skb,dev);
 }
 
 static int atm_mpoa_vcc_attach(struct atm_vcc *vcc, void __user *arg)
diff --git a/net/atm/mpc.h b/net/atm/mpc.h
index 24c386c35f57..0919a88bbc70 100644
--- a/net/atm/mpc.h
+++ b/net/atm/mpc.h
@@ -15,7 +15,7 @@ struct mpoa_client {
         struct mpoa_client *next;
         struct net_device *dev;      /* lec in question                     */
         int dev_num;                 /* e.g. 2 for lec2                     */
-        int (*old_hard_start_xmit)(struct sk_buff *skb, struct net_device *dev);
+
         struct atm_vcc *mpoad_vcc;   /* control channel to mpoad            */
         uint8_t mps_ctrl_addr[ATM_ESA_LEN];  /* MPS control ATM address     */
         uint8_t our_ctrl_addr[ATM_ESA_LEN];  /* MPC's control ATM address   */
@@ -31,6 +31,9 @@ struct mpoa_client {
         uint8_t *mps_macs;           /* array of MPS MAC addresses, >=1     */
         int number_of_mps_macs;      /* number of the above MAC addresses   */
         struct mpc_parameters parameters;  /* parameters for this client    */
+
+        const struct net_device_ops *old_ops;
+        struct net_device_ops new_ops;
 };