tipc: add broadcast link window set/get to nl api

Add the ability to get or set the broadcast link window through the
new netlink API. The functionality was unintentionally missing from
the new netlink API. Adding this means that we also fix the breakage
in the old API when coming through the compat layer.

Fixes: 37e2d4843f9e (tipc: convert legacy nl link prop set to nl compat)
Reported-by: Tomi Ollila <tomi.ollila@iki.fi>
Signed-off-by: Richard Alpe <richard.alpe@ericsson.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Reviewed-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
index c5cbdcb1f0b561a22d2f5537f5cca0a80ee36486..3e18fc6c7877ec3d6cd9fb609cd10a7bcf4f3af0 100644 (file)
--- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
@@ -866,6 +866,27 @@ int tipc_bclink_set_queue_limits(struct net *net, u32 limit)
        return 0;
 }
 
+int tipc_nl_bc_link_set(struct net *net, struct nlattr *attrs[])
+{
+       int err;
+       u32 win;
+       struct nlattr *props[TIPC_NLA_PROP_MAX + 1];
+
+       if (!attrs[TIPC_NLA_LINK_PROP])
+               return -EINVAL;
+
+       err = tipc_nl_parse_link_prop(attrs[TIPC_NLA_LINK_PROP], props);
+       if (err)
+               return err;
+
+       if (!props[TIPC_NLA_PROP_WIN])
+               return -EOPNOTSUPP;
+
+       win = nla_get_u32(props[TIPC_NLA_PROP_WIN]);
+
+       return tipc_bclink_set_queue_limits(net, win);
+}
+
 int tipc_bclink_init(struct net *net)
 {
        struct tipc_net *tn = net_generic(net, tipc_net_id);

diff --git a/net/tipc/bcast.h b/net/tipc/bcast.h
index 4bdc12277d33ff8eb382b755dd1323424d9d43a2..3c290a48f72037ece5eddfb55c55d501e7f61e67 100644 (file)
--- a/net/tipc/bcast.h
+++ b/net/tipc/bcast.h
@@ -131,6 +131,7 @@ uint  tipc_bclink_get_mtu(void);
 int tipc_bclink_xmit(struct net *net, struct sk_buff_head *list);
 void tipc_bclink_wakeup_users(struct net *net);
 int tipc_nl_add_bc_link(struct net *net, struct tipc_nl_msg *msg);
+int tipc_nl_bc_link_set(struct net *net, struct nlattr *attrs[]);
 void tipc_bclink_input(struct net *net);
 
 #endif

diff --git a/net/tipc/link.c b/net/tipc/link.c
index 43a515dc97b0d4a2c7fca5bc9dc2951175201fff..374d52335168714c5f7a571ed83c98ae0b6896c2 100644 (file)
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -1893,6 +1893,9 @@ int tipc_nl_link_set(struct sk_buff *skb, struct genl_info *info)
 
        name = nla_data(attrs[TIPC_NLA_LINK_NAME]);
 
+       if (strcmp(name, tipc_bclink_name) == 0)
+               return tipc_nl_bc_link_set(net, attrs);
+
        node = tipc_link_find_owner(net, name, &bearer_id);
        if (!node)
                return -EINVAL;
@@ -2175,50 +2178,53 @@ out:
 int tipc_nl_link_get(struct sk_buff *skb, struct genl_info *info)
 {
        struct net *net = genl_info_net(info);
-       struct sk_buff *ans_skb;
        struct tipc_nl_msg msg;
-       struct tipc_link *link;
-       struct tipc_node *node;
        char *name;
-       int bearer_id;
        int err;
 
+       msg.portid = info->snd_portid;
+       msg.seq = info->snd_seq;
+
        if (!info->attrs[TIPC_NLA_LINK_NAME])
                return -EINVAL;
-
        name = nla_data(info->attrs[TIPC_NLA_LINK_NAME]);
-       node = tipc_link_find_owner(net, name, &bearer_id);
-       if (!node)
-               return -EINVAL;
 
-       ans_skb = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
-       if (!ans_skb)
+       msg.skb = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+       if (!msg.skb)
                return -ENOMEM;
 
-       msg.skb = ans_skb;
-       msg.portid = info->snd_portid;
-       msg.seq = info->snd_seq;
-
-       tipc_node_lock(node);
-       link = node->links[bearer_id];
-       if (!link) {
-               err = -EINVAL;
-               goto err_out;
-       }
-
-       err = __tipc_nl_add_link(net, &msg, link, 0);
-       if (err)
-               goto err_out;
+       if (strcmp(name, tipc_bclink_name) == 0) {
+               err = tipc_nl_add_bc_link(net, &msg);
+               if (err) {
+                       nlmsg_free(msg.skb);
+                       return err;
+               }
+       } else {
+               int bearer_id;
+               struct tipc_node *node;
+               struct tipc_link *link;
 
-       tipc_node_unlock(node);
+               node = tipc_link_find_owner(net, name, &bearer_id);
+               if (!node)
+                       return -EINVAL;
 
-       return genlmsg_reply(ans_skb, info);
+               tipc_node_lock(node);
+               link = node->links[bearer_id];
+               if (!link) {
+                       tipc_node_unlock(node);
+                       nlmsg_free(msg.skb);
+                       return -EINVAL;
+               }
 
-err_out:
-       tipc_node_unlock(node);
-       nlmsg_free(ans_skb);
+               err = __tipc_nl_add_link(net, &msg, link, 0);
+               tipc_node_unlock(node);
+               if (err) {
+                       nlmsg_free(msg.skb);
+                       return err;
+               }
+       }
 
-       return err;
+       return genlmsg_reply(msg.skb, info);
 }
 
 int tipc_nl_link_reset_stats(struct sk_buff *skb, struct genl_info *info)