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>

5 files changed, 22 insertions, 22 deletions

diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
index 64e45c97c244..b27e09d1e2e4 100644
--- a/drivers/net/bonding/bond_netlink.c
+++ b/drivers/net/bonding/bond_netlink.c
@@ -227,7 +227,8 @@ static int bond_changelink(struct net_device *bond_dev,
                 if (dev)
                         primary = dev->name;
 
-                err = bond_option_primary_set(bond, primary);
+                bond_opt_initstr(&newval, primary);
+                err = __bond_opt_set(bond, BOND_OPT_PRIMARY, &newval);
                 if (err)
                         return err;
         }
diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c
index cb515d94864d..f094a313adb3 100644
--- a/drivers/net/bonding/bond_options.c
+++ b/drivers/net/bonding/bond_options.c
@@ -207,6 +207,16 @@ static struct bond_option bond_opts[] = {
                 .values = bond_intmax_tbl,
                 .set = bond_option_miimon_set
         },
+        [BOND_OPT_PRIMARY] = {
+                .id = BOND_OPT_PRIMARY,
+                .name = "primary",
+                .desc = "Primary network device to use",
+                .flags = BOND_OPTFLAG_RAWVAL,
+                .unsuppmodes = BOND_MODE_ALL_EX(BIT(BOND_MODE_ACTIVEBACKUP) |
+                                                BIT(BOND_MODE_TLB) |
+                                                BIT(BOND_MODE_ALB)),
+                .set = bond_option_primary_set
+        },
         { }
 };
 
@@ -885,23 +895,19 @@ int bond_option_arp_all_targets_set(struct bonding *bond,
         return 0;
 }
 
-int bond_option_primary_set(struct bonding *bond, const char *primary)
+int bond_option_primary_set(struct bonding *bond, struct bond_opt_value *newval)
 {
+        char *p, *primary = newval->string;
         struct list_head *iter;
         struct slave *slave;
-        int err = 0;
 
         block_netpoll_tx();
         read_lock(&bond->lock);
         write_lock_bh(&bond->curr_slave_lock);
 
-        if (!USES_PRIMARY(bond->params.mode)) {
-                pr_err("%s: Unable to set primary slave; %s is in mode %d\n",
-                       bond->dev->name, bond->dev->name, bond->params.mode);
-                err = -EINVAL;
-                goto out;
-        }
-
+        p = strchr(primary, '\n');
+        if (p)
+                *p = '\0';
         /* check to see if we are clearing primary */
         if (!strlen(primary)) {
                 pr_info("%s: Setting primary slave to None.\n",
@@ -934,7 +940,7 @@ out:
         read_unlock(&bond->lock);
         unblock_netpoll_tx();
 
-        return err;
+        return 0;
 }
 
 int bond_option_primary_reselect_set(struct bonding *bond, int primary_reselect)
diff --git a/drivers/net/bonding/bond_options.h b/drivers/net/bonding/bond_options.h
index 90f00c64030c..6ff831030545 100644
--- a/drivers/net/bonding/bond_options.h
+++ b/drivers/net/bonding/bond_options.h
@@ -53,6 +53,7 @@ enum {
         BOND_OPT_AD_SELECT,
         BOND_OPT_NUM_PEER_NOTIF,
         BOND_OPT_MIIMON,
+        BOND_OPT_PRIMARY,
         BOND_OPT_LAST
 };
 
@@ -141,4 +142,6 @@ int bond_option_ad_select_set(struct bonding *bond,
 int bond_option_num_peer_notif_set(struct bonding *bond,
                                    struct bond_opt_value *newval);
 int bond_option_miimon_set(struct bonding *bond, struct bond_opt_value *newval);
+int bond_option_primary_set(struct bonding *bond,
+                            struct bond_opt_value *newval);
 #endif /* _BOND_OPTIONS_H */
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 3f6e4d614a47..10c58ef4876d 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,
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 4d0461959357..891685483034 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -456,7 +456,6 @@ int bond_option_active_slave_set(struct bonding *bond, struct net_device *slave_
 int bond_option_use_carrier_set(struct bonding *bond, int use_carrier);
 int bond_option_arp_ip_target_add(struct bonding *bond, __be32 target);
 int bond_option_arp_ip_target_rem(struct bonding *bond, __be32 target);
-int bond_option_primary_set(struct bonding *bond, const char *primary);
 int bond_option_primary_reselect_set(struct bonding *bond,
                                      int primary_reselect);
 int bond_option_resend_igmp_set(struct bonding *bond, int resend_igmp);