Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1429 commits)
  net: Allow dependancies of FDDI & Tokenring to be modular.
  igb: Fix build warning when DCA is disabled.
  net: Fix warning fallout from recent NAPI interface changes.
  gro: Fix potential use after free
  sfc: If AN is enabled, always read speed/duplex from the AN advertising bits
  sfc: When disabling the NIC, close the device rather than unregistering it
  sfc: SFT9001: Add cable diagnostics
  sfc: Add support for multiple PHY self-tests
  sfc: Merge top-level functions for self-tests
  sfc: Clean up PHY mode management in loopback self-test
  sfc: Fix unreliable link detection in some loopback modes
  sfc: Generate unique names for per-NIC workqueues
  802.3ad: use standard ethhdr instead of ad_header
  802.3ad: generalize out mac address initializer
  802.3ad: initialize ports LACPDU from const initializer
  802.3ad: remove typedef around ad_system
  802.3ad: turn ports is_individual into a bool
  802.3ad: turn ports is_enabled into a bool
  802.3ad: make ntt bool
  ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
  ...

Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due
to the conversion to %pI (in this networking merge) and the addition of
doing IPv6 addresses (from the earlier merge of CIFS).

1 files changed, 11 insertions, 25 deletions

diff --git a/net/wanrouter/wanmain.c b/net/wanrouter/wanmain.c
index 7f07152bc109..39701dec1dba 100644
--- a/net/wanrouter/wanmain.c
+++ b/net/wanrouter/wanmain.c
@@ -60,6 +60,8 @@
 
 #define KMEM_SAFETYZONE 8
 
+#define DEV_TO_SLAVE(dev)       (*((struct net_device **)netdev_priv(dev)))
+
 /*
  *      Function Prototypes
  */
@@ -511,7 +513,7 @@ static int wanrouter_device_shutdown(struct wan_device *wandev)
                 if (err)
                         return err;
                 /* The above function deallocates the current dev
-                 * structure. Therefore, we cannot use dev->priv
+                 * structure. Therefore, we cannot use netdev_priv(dev)
                  * as the next element: wandev->dev points to the
                  * next element */
                 dev = wandev->dev;
@@ -589,10 +591,6 @@ static int wanrouter_device_new_if(struct wan_device *wandev,
                 err = -EPROTONOSUPPORT;
                 goto out;
         } else {
-                dev = kzalloc(sizeof(struct net_device), GFP_KERNEL);
-                err = -ENOBUFS;
-                if (dev == NULL)
-                        goto out;
                 err = wandev->new_if(wandev, dev, cnf);
         }
 
@@ -622,10 +620,9 @@ static int wanrouter_device_new_if(struct wan_device *wandev,
                                         wandev->dev = dev;
                                 } else {
                                         for (slave=wandev->dev;
-                                         *((struct net_device **)slave->priv);
-                                 slave = *((struct net_device **)slave->priv));
-
-                                     *((struct net_device **)slave->priv) = dev;
+                                             DEV_TO_SLAVE(slave);
+                                             slave = DEV_TO_SLAVE(slave))
+                                                DEV_TO_SLAVE(slave) = dev;
                                 }
                                 ++wandev->ndev;
 
@@ -636,15 +633,9 @@ static int wanrouter_device_new_if(struct wan_device *wandev,
                 }
                 if (wandev->del_if)
                         wandev->del_if(wandev, dev);
+                free_netdev(dev);
         }
 
-        /* This code has moved from del_if() function */
-        kfree(dev->priv);
-        dev->priv = NULL;
-
-        /* Sync PPP is disabled */
-        if (cnf->config_id != WANCONFIG_MPPP)
-                kfree(dev);
 out:
         kfree(cnf);
         return err;
@@ -734,7 +725,7 @@ static int wanrouter_delete_interface(struct wan_device *wandev, char *name)
         dev = wandev->dev;
         prev = NULL;
         while (dev && strcmp(name, dev->name)) {
-                struct net_device **slave = dev->priv;
+                struct net_device **slave = netdev_priv(dev);
                 prev = dev;
                 dev = *slave;
         }
@@ -751,12 +742,12 @@ static int wanrouter_delete_interface(struct wan_device *wandev, char *name)
 
         lock_adapter_irq(&wandev->lock, &smp_flags);
         if (prev) {
-                struct net_device **prev_slave = prev->priv;
-                struct net_device **slave = dev->priv;
+                struct net_device **prev_slave = netdev_priv(prev);
+                struct net_device **slave = netdev_priv(dev);
 
                 *prev_slave = *slave;
         } else {
-                struct net_device **slave = dev->priv;
+                struct net_device **slave = netdev_priv(dev);
                 wandev->dev = *slave;
         }
         --wandev->ndev;
@@ -764,11 +755,6 @@ static int wanrouter_delete_interface(struct wan_device *wandev, char *name)
 
         printk(KERN_INFO "%s: unregistering '%s'\n", wandev->name, dev->name);
 
-        /* Due to new interface linking method using dev->priv,
-         * this code has moved from del_if() function.*/
-        kfree(dev->priv);
-        dev->priv=NULL;
-
         unregister_netdev(dev);
 
         free_netdev(dev);