Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (116 commits)
  sk98lin: planned removal
  AT91: MACB support
  sky2: version 1.12
  sky2: add new chip ids
  sky2: Yukon Extreme support
  sky2: safer transmit timeout
  sky2: TSO support for EC_U
  sky2: use dev_err for error reports
  sky2: add Wake On Lan support
  fix unaligned exception in /drivers/net/wireless/orinoco.c
  Remove unused kernel config option DLCI_COUNT
  z85230: spinlock logic
  mips: declance: Driver model for the PMAD-A
  Spidernet: Rework RX linked list
  NET: turn local_save_flags() + local_irq_disable() into local_irq_save()
  NET-3c59x: turn local_save_flags() + local_irq_disable() into local_irq_save()
  hp100: convert pci_module_init() to pci_register_driver()
  NetXen: Added ethtool support for user level tools.
  NetXen: Firmware crb init changes.
  maintainers: add atl1 maintainers
  ...

3 files changed, 37 insertions, 10 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 6482aed4bb..d3801a00d3 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4704,6 +4704,7 @@ static int bond_check_params(struct bond_params *params)
 static struct lock_class_key bonding_netdev_xmit_lock_key;
 
 /* Create a new bond based on the specified name and bonding parameters.
+ * If name is NULL, obtain a suitable "bond%d" name for us.
  * Caller must NOT hold rtnl_lock; we need to release it here before we
  * set up our sysfs entries.
  */
@@ -4713,7 +4714,8 @@ int bond_create(char *name, struct bond_params *params, struct bonding **newbond
         int res;
 
         rtnl_lock();
-        bond_dev = alloc_netdev(sizeof(struct bonding), name, ether_setup);
+        bond_dev = alloc_netdev(sizeof(struct bonding), name ? name : "",
+                                ether_setup);
         if (!bond_dev) {
                 printk(KERN_ERR DRV_NAME
                        ": %s: eek! can't alloc netdev!\n",
@@ -4722,6 +4724,12 @@ int bond_create(char *name, struct bond_params *params, struct bonding **newbond
                 goto out_rtnl;
         }
 
+        if (!name) {
+                res = dev_alloc_name(bond_dev, "bond%d");
+                if (res < 0)
+                        goto out_netdev;
+        }
+
         /* bond_init() must be called after dev_alloc_name() (for the
          * /proc files), but before register_netdevice(), because we
          * need to set function pointers.
@@ -4748,14 +4756,19 @@ int bond_create(char *name, struct bond_params *params, struct bonding **newbond
 
         rtnl_unlock(); /* allows sysfs registration of net device */
         res = bond_create_sysfs_entry(bond_dev->priv);
-        goto done;
+        if (res < 0) {
+                rtnl_lock();
+                goto out_bond;
+        }
+
+        return 0;
+
 out_bond:
         bond_deinit(bond_dev);
 out_netdev:
         free_netdev(bond_dev);
 out_rtnl:
         rtnl_unlock();
-done:
         return res;
 }
 
@@ -4763,7 +4776,6 @@ static int __init bonding_init(void)
 {
         int i;
         int res;
-        char new_bond_name[8];  /* Enough room for 999 bonds at init. */
 
         printk(KERN_INFO "%s", version);
 
@@ -4776,8 +4788,7 @@ static int __init bonding_init(void)
         bond_create_proc_dir();
 #endif
         for (i = 0; i < max_bonds; i++) {
-                sprintf(new_bond_name, "bond%d",i);
-                res = bond_create(new_bond_name,&bonding_defaults, NULL);
+                res = bond_create(NULL, &bonding_defaults, NULL);
                 if (res)
                         goto err;
         }
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index ced9ed8f99..8e317e1155 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -1372,6 +1372,21 @@ int bond_create_sysfs(void)
                 return -ENODEV;
 
         ret = class_create_file(netdev_class, &class_attr_bonding_masters);
+        /*
+         * Permit multiple loads of the module by ignoring failures to
+         * create the bonding_masters sysfs file.  Bonding devices
+         * created by second or subsequent loads of the module will
+         * not be listed in, or controllable by, bonding_masters, but
+         * will have the usual "bonding" sysfs directory.
+         *
+         * This is done to preserve backwards compatibility for
+         * initscripts/sysconfig, which load bonding multiple times to
+         * configure multiple bonding devices.
+         */
+        if (ret == -EEXIST) {
+                netdev_class = NULL;
+                return 0;
+        }
 
         return ret;
 
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 0978c9ac6d..41aa78bf1f 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -22,8 +22,8 @@
 #include "bond_3ad.h"
 #include "bond_alb.h"
 
-#define DRV_VERSION     "3.1.1"
-#define DRV_RELDATE     "September 26, 2006"
+#define DRV_VERSION     "3.1.2"
+#define DRV_RELDATE     "January 20, 2007"
 #define DRV_NAME        "bonding"
 #define DRV_DESCRIPTION "Ethernet Channel Bonding Driver"
 
@@ -237,12 +237,13 @@ static inline struct bonding *bond_get_bond_by_slave(struct slave *slave)
 #define BOND_ARP_VALIDATE_ALL           (BOND_ARP_VALIDATE_ACTIVE | \
                                          BOND_ARP_VALIDATE_BACKUP)
 
-extern inline int slave_do_arp_validate(struct bonding *bond, struct slave *slave)
+static inline int slave_do_arp_validate(struct bonding *bond,
+                                        struct slave *slave)
 {
         return bond->params.arp_validate & (1 << slave->state);
 }
 
-extern inline unsigned long slave_last_rx(struct bonding *bond,
+static inline unsigned long slave_last_rx(struct bonding *bond,
                                         struct slave *slave)
 {
         if (slave_do_arp_validate(bond, slave))