tipc: convert legacy nl media dump to nl compat

Convert TIPC_CMD_GET_MEDIA_NAMES to compat dumpit.

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/bearer.c b/net/tipc/bearer.c
index de1c800ef80620d8eb38d7793262dc7db442d38e..c7e3b5d3baa9cbb7a9c07ada39eb3c88a4f299c3 100644 (file)
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -123,26 +123,6 @@ void tipc_media_addr_printf(char *buf, int len, struct tipc_media_addr *a)
        }
 }
 
-/**
- * tipc_media_get_names - record names of registered media in buffer
- */
-struct sk_buff *tipc_media_get_names(void)
-{
-       struct sk_buff *buf;
-       int i;
-
-       buf = tipc_cfg_reply_alloc(MAX_MEDIA * TLV_SPACE(TIPC_MAX_MEDIA_NAME));
-       if (!buf)
-               return NULL;
-
-       for (i = 0; media_info_array[i] != NULL; i++) {
-               tipc_cfg_append_tlv(buf, TIPC_TLV_MEDIA_NAME,
-                                   media_info_array[i]->name,
-                                   strlen(media_info_array[i]->name) + 1);
-       }
-       return buf;
-}
-
 /**
  * bearer_name_validate - validate & (optionally) deconstruct bearer name
  * @name: ptr to bearer name string

diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h
index 06f25d144871e0c4060263e429ae94152fedd9b0..6b17795ff8bc309d70628c07566dc455e638614a 100644 (file)
--- a/net/tipc/bearer.h
+++ b/net/tipc/bearer.h
@@ -196,7 +196,6 @@ int tipc_nl_media_set(struct sk_buff *skb, struct genl_info *info);
 int tipc_media_set_priority(const char *name, u32 new_value);
 int tipc_media_set_window(const char *name, u32 new_value);
 void tipc_media_addr_printf(char *buf, int len, struct tipc_media_addr *a);
-struct sk_buff *tipc_media_get_names(void);
 int tipc_enable_l2_media(struct net *net, struct tipc_bearer *b);
 void tipc_disable_l2_media(struct tipc_bearer *b);
 int tipc_l2_send_msg(struct net *net, struct sk_buff *buf,

diff --git a/net/tipc/config.c b/net/tipc/config.c
index 6e4c215879c81eeb3a347756ed4711195b928080..df410823e88932a72e797e33d45a7a5c0ed0383e 100644 (file)
--- a/net/tipc/config.c
+++ b/net/tipc/config.c
@@ -209,9 +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_GET_MEDIA_NAMES:
-               rep_tlv_buf = tipc_media_get_names();
-               break;
        case TIPC_CMD_SHOW_STATS:
                rep_tlv_buf = tipc_show_stats();
                break;

diff --git a/net/tipc/netlink_compat.c b/net/tipc/netlink_compat.c
index 48e15a4a36d8714a08674e6171b382fda4c1c6d9..d23075efaa76f5dc777c3b9a7b4098c78864b72f 100644 (file)
--- a/net/tipc/netlink_compat.c
+++ b/net/tipc/netlink_compat.c
@@ -822,6 +822,19 @@ static int tipc_nl_compat_sk_dump(struct tipc_nl_compat_msg *msg,
        return 0;
 }
 
+static int tipc_nl_compat_media_dump(struct tipc_nl_compat_msg *msg,
+                                    struct nlattr **attrs)
+{
+       struct nlattr *media[TIPC_NLA_MEDIA_MAX + 1];
+
+       nla_parse_nested(media, TIPC_NLA_MEDIA_MAX, attrs[TIPC_NLA_MEDIA],
+                        NULL);
+
+       return tipc_add_tlv(msg->rep, TIPC_TLV_MEDIA_NAME,
+                           nla_data(media[TIPC_NLA_MEDIA_NAME]),
+                           nla_len(media[TIPC_NLA_MEDIA_NAME]));
+}
+
 static int tipc_nl_compat_handle(struct tipc_nl_compat_msg *msg)
 {
        struct tipc_nl_compat_cmd_dump dump;
@@ -885,6 +898,11 @@ static int tipc_nl_compat_handle(struct tipc_nl_compat_msg *msg)
                dump.dumpit = tipc_nl_sk_dump;
                dump.format = tipc_nl_compat_sk_dump;
                return tipc_nl_compat_dumpit(&dump, msg);
+       case TIPC_CMD_GET_MEDIA_NAMES:
+               msg->rep_size = MAX_MEDIA * TLV_SPACE(TIPC_MAX_MEDIA_NAME);
+               dump.dumpit = tipc_nl_media_dump;
+               dump.format = tipc_nl_compat_media_dump;
+               return tipc_nl_compat_dumpit(&dump, msg);
        }
 
        return -EOPNOTSUPP;
@@ -992,6 +1010,7 @@ static int tipc_nl_compat_tmp_wrap(struct sk_buff *skb, struct genl_info *info)
        case TIPC_CMD_RESET_LINK_STATS:
        case TIPC_CMD_SHOW_NAME_TABLE:
        case TIPC_CMD_SHOW_PORTS:
+       case TIPC_CMD_GET_MEDIA_NAMES:
                return tipc_nl_compat_recv(skb, info);
        }