summaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding/bond_sysfs.c
diff options
context:
space:
mode:
authorNikolay Aleksandrov <nikolay@redhat.com>2014-01-22 14:53:32 +0100
committerDavid S. Miller <davem@davemloft.net>2014-01-22 15:38:43 -0800
commit180222f08861d8206b3ff1c6392101e29d4ae161 (patch)
tree4ce7f73dc463164f8539bdc40f627b4b0808b95e /drivers/net/bonding/bond_sysfs.c
parentb98d9c66e1c3823c50a3cd5e8e59f12b97d7ba5d (diff)
downloadop-kernel-dev-180222f08861d8206b3ff1c6392101e29d4ae161.zip
op-kernel-dev-180222f08861d8206b3ff1c6392101e29d4ae161.tar.gz
bonding: convert primary to use the new option API
This patch adds the necessary changes so primary would use the new bonding option API. Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bond_sysfs.c')
-rw-r--r--drivers/net/bonding/bond_sysfs.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 3f6e4d6..10c58ef 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -710,21 +710,12 @@ static ssize_t bonding_store_primary(struct device *d,
const char *buf, size_t count)
{
struct bonding *bond = to_bond(d);
- char ifname[IFNAMSIZ];
int ret;
- sscanf(buf, "%15s", ifname); /* IFNAMSIZ */
- if (ifname[0] == '\n')
- ifname[0] = '\0';
-
- if (!rtnl_trylock())
- return restart_syscall();
-
- ret = bond_option_primary_set(bond, ifname);
+ ret = bond_opt_tryset_rtnl(bond, BOND_OPT_PRIMARY, (char *)buf);
if (!ret)
ret = count;
- rtnl_unlock();
return ret;
}
static DEVICE_ATTR(primary, S_IRUGO | S_IWUSR,
OpenPOWER on IntegriCloud