bonding: add num_grat_arp attribute netlink support

Add IFLA_BOND_NUM_PEER_NOTIF to allow get/set of bonding parameter
num_grat_arp via netlink.  Bonding parameter num_unsol_na is
synonymous with num_grat_arp, so add only one netlink attribute
to represent both bonding parameters.

Signed-off-by: Scott Feldman <sfeldma@cumulusnetworks.com>
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
index e161c9cbd91e37dea2c6da8821b72cef478e1893..07123a0fcf5d47350b36af85b8431694bf5663e1 100644 (file)
--- a/drivers/net/bonding/bond_netlink.c
+++ b/drivers/net/bonding/bond_netlink.c
@@ -37,6 +37,7 @@ static const struct nla_policy bond_policy[IFLA_BOND_MAX + 1] = {
        [IFLA_BOND_FAIL_OVER_MAC]       = { .type = NLA_U8 },
        [IFLA_BOND_XMIT_HASH_POLICY]    = { .type = NLA_U8 },
        [IFLA_BOND_RESEND_IGMP]         = { .type = NLA_U32 },
+       [IFLA_BOND_NUM_PEER_NOTIF]      = { .type = NLA_U8 },
 };
 
 static int bond_validate(struct nlattr *tb[], struct nlattr *data[])
@@ -204,6 +205,14 @@ static int bond_changelink(struct net_device *bond_dev,
                if (err)
                        return err;
        }
+       if (data[IFLA_BOND_NUM_PEER_NOTIF]) {
+               int num_peer_notif =
+                       nla_get_u8(data[IFLA_BOND_NUM_PEER_NOTIF]);
+
+               err = bond_option_num_peer_notif_set(bond, num_peer_notif);
+               if (err)
+                       return err;
+       }
        return 0;
 }
 
@@ -237,6 +246,7 @@ static size_t bond_get_size(const struct net_device *bond_dev)
                nla_total_size(sizeof(u8)) +    /* IFLA_BOND_FAIL_OVER_MAC */
                nla_total_size(sizeof(u8)) +    /* IFLA_BOND_XMIT_HASH_POLICY */
                nla_total_size(sizeof(u32)) +   /* IFLA_BOND_RESEND_IGMP */
+               nla_total_size(sizeof(u8)) +    /* IFLA_BOND_NUM_PEER_NOTIF */
                0;
 }
 
@@ -317,6 +327,10 @@ static int bond_fill_info(struct sk_buff *skb,
                        bond->params.resend_igmp))
                goto nla_put_failure;
 
+       if (nla_put_u8(skb, IFLA_BOND_NUM_PEER_NOTIF,
+                      bond->params.num_peer_notif))
+               goto nla_put_failure;
+
        return 0;
 
 nla_put_failure:

diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c
index 1ed7dff9a67928da1977f5340dab51daad50265a..01a966916dcb837e7db89219fc681412ce51b6b1 100644 (file)
--- a/drivers/net/bonding/bond_options.c
+++ b/drivers/net/bonding/bond_options.c
@@ -576,3 +576,9 @@ int bond_option_resend_igmp_set(struct bonding *bond, int resend_igmp)
 
        return 0;
 }
+
+int bond_option_num_peer_notif_set(struct bonding *bond, int num_peer_notif)
+{
+       bond->params.num_peer_notif = num_peer_notif;
+       return 0;
+}

diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index f5c1a54095b9120bf016c897f44ea9faa34bc1ba..7efa33a8553ff6bdb5fdb68eaecd6d7bc8a9ada3 100644 (file)
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -790,8 +790,25 @@ static ssize_t bonding_store_num_peer_notif(struct device *d,
                                            const char *buf, size_t count)
 {
        struct bonding *bond = to_bond(d);
-       int err = kstrtou8(buf, 10, &bond->params.num_peer_notif);
-       return err ? err : count;
+       u8 new_value;
+       int ret;
+
+       ret = kstrtou8(buf, 10, &new_value);
+       if (!ret) {
+               pr_err("%s: invalid value %s specified.\n",
+                      bond->dev->name, buf);
+               return ret;
+       }
+
+       if (!rtnl_trylock())
+               return restart_syscall();
+
+       ret = bond_option_num_peer_notif_set(bond, new_value);
+       if (!ret)
+               ret = count;
+
+       rtnl_unlock();
+       return ret;
 }
 static DEVICE_ATTR(num_grat_arp, S_IRUGO | S_IWUSR,
                   bonding_show_num_peer_notif, bonding_store_num_peer_notif);

diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index c70ad9f02b1e82114b65bef4437ea31464cfba02..73538b7a45e15db9dddace21823ec8f099477530 100644 (file)
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -461,6 +461,7 @@ int bond_option_fail_over_mac_set(struct bonding *bond, int fail_over_mac);
 int bond_option_xmit_hash_policy_set(struct bonding *bond,
                                     int xmit_hash_policy);
 int bond_option_resend_igmp_set(struct bonding *bond, int resend_igmp);
+int bond_option_num_peer_notif_set(struct bonding *bond, int num_peer_notif);
 struct net_device *bond_option_active_slave_get_rcu(struct bonding *bond);
 struct net_device *bond_option_active_slave_get(struct bonding *bond);
 

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 6e275d5214f3e9a99d003d62b17fa10feece031d..bfe3d3b561ee0824f33dbe2a60989bfa67354cb5 100644 (file)
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -344,6 +344,7 @@ enum {
        IFLA_BOND_FAIL_OVER_MAC,
        IFLA_BOND_XMIT_HASH_POLICY,
        IFLA_BOND_RESEND_IGMP,
+       IFLA_BOND_NUM_PEER_NOTIF,
        __IFLA_BOND_MAX,
 };