diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-05-18 00:10:09 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-05-22 06:34:21 -0400 |
commit | 0dd646fe0549251e79d6fb03e6773bcc6ccea61f (patch) | |
tree | f767ff2d0df29a8917b309819123e7873a5c7271 /drivers/net/bonding/bond_main.c | |
parent | 4b8a9239ee708958ed72722a0e5e0cf34243ad26 (diff) |
bonding: Remove redundant argument from bond_create.
While we're fixing the bond_create, I hope it's OK to polish it
a bit after the fixes.
The third argument is NULL at the first caller and is ignored by
the second one, so remove it.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Acked-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
-rw-r--r-- | drivers/net/bonding/bond_main.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index e3da1e53b9ce..6b1216455bc9 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
@@ -4848,7 +4848,7 @@ static struct lock_class_key bonding_netdev_xmit_lock_key; | |||
4848 | * Caller must NOT hold rtnl_lock; we need to release it here before we | 4848 | * Caller must NOT hold rtnl_lock; we need to release it here before we |
4849 | * set up our sysfs entries. | 4849 | * set up our sysfs entries. |
4850 | */ | 4850 | */ |
4851 | int bond_create(char *name, struct bond_params *params, struct bonding **newbond) | 4851 | int bond_create(char *name, struct bond_params *params) |
4852 | { | 4852 | { |
4853 | struct net_device *bond_dev; | 4853 | struct net_device *bond_dev; |
4854 | struct bonding *bond, *nxt; | 4854 | struct bonding *bond, *nxt; |
@@ -4902,9 +4902,6 @@ int bond_create(char *name, struct bond_params *params, struct bonding **newbond | |||
4902 | 4902 | ||
4903 | lockdep_set_class(&bond_dev->_xmit_lock, &bonding_netdev_xmit_lock_key); | 4903 | lockdep_set_class(&bond_dev->_xmit_lock, &bonding_netdev_xmit_lock_key); |
4904 | 4904 | ||
4905 | if (newbond) | ||
4906 | *newbond = bond_dev->priv; | ||
4907 | |||
4908 | netif_carrier_off(bond_dev); | 4905 | netif_carrier_off(bond_dev); |
4909 | 4906 | ||
4910 | up_write(&bonding_rwsem); | 4907 | up_write(&bonding_rwsem); |
@@ -4950,7 +4947,7 @@ static int __init bonding_init(void) | |||
4950 | init_rwsem(&bonding_rwsem); | 4947 | init_rwsem(&bonding_rwsem); |
4951 | 4948 | ||
4952 | for (i = 0; i < max_bonds; i++) { | 4949 | for (i = 0; i < max_bonds; i++) { |
4953 | res = bond_create(NULL, &bonding_defaults, NULL); | 4950 | res = bond_create(NULL, &bonding_defaults); |
4954 | if (res) | 4951 | if (res) |
4955 | goto err; | 4952 | goto err; |
4956 | } | 4953 | } |