Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0dd646fe authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by Jeff Garzik
Browse files

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: default avatarPavel Emelyanov <xemul@openvz.org>
Acked-by: default avatarJay Vosburgh <fubar@us.ibm.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 4b8a9239

drivers/net/bonding/bond_main.c

+2 −5
Original line number Diff line number Diff line
@@ -4848,7 +4848,7 @@ static struct lock_class_key bonding_netdev_xmit_lock_key; 
 * Caller must NOT hold rtnl_lock; we need to release it here before we

 * set up our sysfs entries.

 */

int bond_create(char *name, struct bond_params *params, struct bonding **newbond)

int bond_create(char *name, struct bond_params *params)

{

	struct net_device *bond_dev;

	struct bonding *bond, *nxt;
@@ -4902,9 +4902,6 @@ int bond_create(char *name, struct bond_params *params, struct bonding **newbond 


	lockdep_set_class(&bond_dev->_xmit_lock, &bonding_netdev_xmit_lock_key);



	if (newbond)

		*newbond = bond_dev->priv;



	netif_carrier_off(bond_dev);



	up_write(&bonding_rwsem);
@@ -4950,7 +4947,7 @@ static int __init bonding_init(void) 
	init_rwsem(&bonding_rwsem);



	for (i = 0; i < max_bonds; i++) {

		res = bond_create(NULL, &bonding_defaults, NULL);

		res = bond_create(NULL, &bonding_defaults);

		if (res)

			goto err;

	}

drivers/net/bonding/bond_sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static ssize_t bonding_store_bonds(struct class *cls, const char *buffer, size_t 
	if (command[0] == '+') {

		printk(KERN_INFO DRV_NAME

			": %s is being created...\n", ifname);

		rv = bond_create(ifname, &bonding_defaults, &bond);

		rv = bond_create(ifname, &bonding_defaults);

		if (rv) {

			printk(KERN_INFO DRV_NAME ": Bond creation failed.\n");

			res = rv;

drivers/net/bonding/bonding.h

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ static inline void bond_unset_master_alb_flags(struct bonding *bond) 


struct vlan_entry *bond_next_vlan(struct bonding *bond, struct vlan_entry *curr);

int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev);

int bond_create(char *name, struct bond_params *params, struct bonding **newbond);

int bond_create(char *name, struct bond_params *params);

void bond_destroy(struct bonding *bond);

int  bond_release_and_destroy(struct net_device *bond_dev, struct net_device *slave_dev);

int bond_create_sysfs(void);