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

Commit 8e4b9329 authored by Wagner Ferenc's avatar Wagner Ferenc Committed by Jeff Garzik
Browse files

bonding: Allow setting and querying xmit policy regardless of mode 



From: Wagner Ferenc <wferi@niif.hu>

For consistency with the behaviour of the arp_ip_target option,
let /sys/class/net/bond0/bonding/xmit_hash_policy accept and report
current policy even if the bonding mode in effect does not use it.

Signed-off-by: default avatarFerenc Wagner <wferi@niif.hu>
Acked-by: default avatarJay Vosburgh <fubar@us.ibm.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 1dcdcd69

drivers/net/bonding/bond_sysfs.c

+3 −18
Original line number Diff line number Diff line
@@ -456,19 +456,13 @@ static ssize_t bonding_show_xmit_hash(struct device *d, 
				      struct device_attribute *attr,

				      char *buf)

{

	int count = 0;

	struct bonding *bond = to_bond(d);



	if ((bond->params.mode == BOND_MODE_XOR) ||

	    (bond->params.mode == BOND_MODE_8023AD)) {

		count = sprintf(buf, "%s %d\n",

	return sprintf(buf, "%s %d\n",

		       xmit_hashtype_tbl[bond->params.xmit_policy].modename,

		       bond->params.xmit_policy);

}



	return count;

}



static ssize_t bonding_store_xmit_hash(struct device *d,

				       struct device_attribute *attr,

				       const char *buf, size_t count)
@@ -484,15 +478,6 @@ static ssize_t bonding_store_xmit_hash(struct device *d, 
		goto out;

	}



	if ((bond->params.mode != BOND_MODE_XOR) &&

	    (bond->params.mode != BOND_MODE_8023AD)) {

		printk(KERN_ERR DRV_NAME

		       "%s: Transmit hash policy is irrelevant in this mode.\n",

		       bond->dev->name);

		ret = -EPERM;

		goto out;

	}



	new_value = bond_parse_parm((char *)buf, xmit_hashtype_tbl);

	if (new_value < 0)  {

		printk(KERN_ERR DRV_NAME