tipc: convert legacy nl link stat reset to nl compat

Convert TIPC_CMD_RESET_LINK_STATS to compat doit.

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>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/tipc/config.c b/net/tipc/config.c
index 75a130e493f5b68f0a33386a0d40d95ebff2fc67..11c16d191fa264527bac2ae213cae48bd38cc225 100644 (file)
--- a/net/tipc/config.c
+++ b/net/tipc/config.c
@@ -209,10 +209,6 @@ struct sk_buff *tipc_cfg_do_cmd(struct net *net, u32 orig_node, u16 cmd,
                rep_tlv_buf = tipc_node_get_nodes(net, req_tlv_area,
                                                  req_tlv_space);
                break;
-       case TIPC_CMD_RESET_LINK_STATS:
-               rep_tlv_buf = tipc_link_cmd_reset_stats(net, req_tlv_area,
-                                                       req_tlv_space);
-               break;
        case TIPC_CMD_SHOW_NAME_TABLE:
                rep_tlv_buf = tipc_nametbl_get(net, req_tlv_area,
                                               req_tlv_space);

diff --git a/net/tipc/link.c b/net/tipc/link.c
index ec136b5cc3397faf90d063c2c1a16c6ccdca49a3..dfe6f4d0b402980366bd98b61828016b417e547b 100644 (file)
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -1969,39 +1969,6 @@ static void link_reset_statistics(struct tipc_link *l_ptr)
        l_ptr->stats.recv_info = l_ptr->next_in_no;
 }
 
-struct sk_buff *tipc_link_cmd_reset_stats(struct net *net,
-                                         const void *req_tlv_area,
-                                         int req_tlv_space)
-{
-       char *link_name;
-       struct tipc_link *l_ptr;
-       struct tipc_node *node;
-       unsigned int bearer_id;
-
-       if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_LINK_NAME))
-               return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
-
-       link_name = (char *)TLV_DATA(req_tlv_area);
-       if (!strcmp(link_name, tipc_bclink_name)) {
-               if (tipc_bclink_reset_stats(net))
-                       return tipc_cfg_reply_error_string("link not found");
-               return tipc_cfg_reply_none();
-       }
-       node = tipc_link_find_owner(net, link_name, &bearer_id);
-       if (!node)
-               return tipc_cfg_reply_error_string("link not found");
-
-       tipc_node_lock(node);
-       l_ptr = node->links[bearer_id];
-       if (!l_ptr) {
-               tipc_node_unlock(node);
-               return tipc_cfg_reply_error_string("link not found");
-       }
-       link_reset_statistics(l_ptr);
-       tipc_node_unlock(node);
-       return tipc_cfg_reply_none();
-}
-
 static void link_print(struct tipc_link *l_ptr, const char *str)
 {
        struct tipc_net *tn = net_generic(l_ptr->owner->net, tipc_net_id);
@@ -2424,7 +2391,7 @@ int tipc_nl_link_reset_stats(struct sk_buff *skb, struct genl_info *info)
        struct tipc_link *link;
        struct tipc_node *node;
        struct nlattr *attrs[TIPC_NLA_LINK_MAX + 1];
-       struct net *net = genl_info_net(info);
+       struct net *net = sock_net(skb->sk);
 
        if (!info->attrs[TIPC_NLA_LINK])
                return -EINVAL;

diff --git a/net/tipc/link.h b/net/tipc/link.h
index 6eb9d606063b7b6155229ec7aad287bb1e8b698a..7aeb52092bf35ffdead0a65c0516785c17fc5a77 100644 (file)
--- a/net/tipc/link.h
+++ b/net/tipc/link.h
@@ -215,9 +215,6 @@ void tipc_link_reset_fragments(struct tipc_link *l_ptr);
 int tipc_link_is_up(struct tipc_link *l_ptr);
 int tipc_link_is_active(struct tipc_link *l_ptr);
 void tipc_link_purge_queues(struct tipc_link *l_ptr);
-struct sk_buff *tipc_link_cmd_reset_stats(struct net *net,
-                                         const void *req_tlv_area,
-                                         int req_tlv_space);
 void tipc_link_reset_all(struct tipc_node *node);
 void tipc_link_reset(struct tipc_link *l_ptr);
 void tipc_link_reset_list(struct net *net, unsigned int bearer_id);

diff --git a/net/tipc/netlink_compat.c b/net/tipc/netlink_compat.c
index 056532b41e7ee6b63ac86a893cdbafb12e59a097..02461233b6d85b2106546f1ccf3e1d52a167fb9e 100644 (file)
--- a/net/tipc/netlink_compat.c
+++ b/net/tipc/netlink_compat.c
@@ -606,6 +606,26 @@ static int tipc_nl_compat_link_set(struct sk_buff *skb,
        return 0;
 }
 
+static int tipc_nl_compat_link_reset_stats(struct sk_buff *skb,
+                                          struct tipc_nl_compat_msg *msg)
+{
+       char *name;
+       struct nlattr *link;
+
+       name = (char *)TLV_DATA(msg->req);
+
+       link = nla_nest_start(skb, TIPC_NLA_LINK);
+       if (!link)
+               return -EMSGSIZE;
+
+       if (nla_put_string(skb, TIPC_NLA_LINK_NAME, name))
+               return -EMSGSIZE;
+
+       nla_nest_end(skb, link);
+
+       return 0;
+}
+
 static int tipc_nl_compat_handle(struct tipc_nl_compat_msg *msg)
 {
        struct tipc_nl_compat_cmd_dump dump;
@@ -650,6 +670,11 @@ static int tipc_nl_compat_handle(struct tipc_nl_compat_msg *msg)
                doit.doit = tipc_nl_link_set;
                doit.transcode = tipc_nl_compat_link_set;
                return tipc_nl_compat_doit(&doit, msg);
+       case TIPC_CMD_RESET_LINK_STATS:
+               msg->req_type = TIPC_TLV_LINK_NAME;
+               doit.doit = tipc_nl_link_reset_stats;
+               doit.transcode = tipc_nl_compat_link_reset_stats;
+               return tipc_nl_compat_doit(&doit, msg);
        }
 
        return -EOPNOTSUPP;
@@ -754,6 +779,7 @@ static int tipc_nl_compat_tmp_wrap(struct sk_buff *skb, struct genl_info *info)
        case TIPC_CMD_SET_LINK_TOL:
        case TIPC_CMD_SET_LINK_PRI:
        case TIPC_CMD_SET_LINK_WINDOW:
+       case TIPC_CMD_RESET_LINK_STATS:
                return tipc_nl_compat_recv(skb, info);
        }