aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/netlink_compat.c
diff options
context:
space:
mode:
authorRichard Alpe <richard.alpe@ericsson.com>2015-02-09 03:50:12 -0500
committerDavid S. Miller <davem@davemloft.net>2015-02-09 16:20:48 -0500
commit5bfc335a637ad4aecededb67b0075aae72a6dbb3 (patch)
tree7989c7ee9e82df89663b088d8fcbca345aab467e /net/tipc/netlink_compat.c
parent487d2a3a1326d339ce273ffbcd03247f2b7b052e (diff)
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>
Diffstat (limited to 'net/tipc/netlink_compat.c')
-rw-r--r--net/tipc/netlink_compat.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/net/tipc/netlink_compat.c b/net/tipc/netlink_compat.c
index 48e15a4a36d8..d23075efaa76 100644
--- 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,
822 return 0; 822 return 0;
823} 823}
824 824
825static int tipc_nl_compat_media_dump(struct tipc_nl_compat_msg *msg,
826 struct nlattr **attrs)
827{
828 struct nlattr *media[TIPC_NLA_MEDIA_MAX + 1];
829
830 nla_parse_nested(media, TIPC_NLA_MEDIA_MAX, attrs[TIPC_NLA_MEDIA],
831 NULL);
832
833 return tipc_add_tlv(msg->rep, TIPC_TLV_MEDIA_NAME,
834 nla_data(media[TIPC_NLA_MEDIA_NAME]),
835 nla_len(media[TIPC_NLA_MEDIA_NAME]));
836}
837
825static int tipc_nl_compat_handle(struct tipc_nl_compat_msg *msg) 838static int tipc_nl_compat_handle(struct tipc_nl_compat_msg *msg)
826{ 839{
827 struct tipc_nl_compat_cmd_dump dump; 840 struct tipc_nl_compat_cmd_dump dump;
@@ -885,6 +898,11 @@ static int tipc_nl_compat_handle(struct tipc_nl_compat_msg *msg)
885 dump.dumpit = tipc_nl_sk_dump; 898 dump.dumpit = tipc_nl_sk_dump;
886 dump.format = tipc_nl_compat_sk_dump; 899 dump.format = tipc_nl_compat_sk_dump;
887 return tipc_nl_compat_dumpit(&dump, msg); 900 return tipc_nl_compat_dumpit(&dump, msg);
901 case TIPC_CMD_GET_MEDIA_NAMES:
902 msg->rep_size = MAX_MEDIA * TLV_SPACE(TIPC_MAX_MEDIA_NAME);
903 dump.dumpit = tipc_nl_media_dump;
904 dump.format = tipc_nl_compat_media_dump;
905 return tipc_nl_compat_dumpit(&dump, msg);
888 } 906 }
889 907
890 return -EOPNOTSUPP; 908 return -EOPNOTSUPP;
@@ -992,6 +1010,7 @@ static int tipc_nl_compat_tmp_wrap(struct sk_buff *skb, struct genl_info *info)
992 case TIPC_CMD_RESET_LINK_STATS: 1010 case TIPC_CMD_RESET_LINK_STATS:
993 case TIPC_CMD_SHOW_NAME_TABLE: 1011 case TIPC_CMD_SHOW_NAME_TABLE:
994 case TIPC_CMD_SHOW_PORTS: 1012 case TIPC_CMD_SHOW_PORTS:
1013 case TIPC_CMD_GET_MEDIA_NAMES:
995 return tipc_nl_compat_recv(skb, info); 1014 return tipc_nl_compat_recv(skb, info);
996 } 1015 }
997 1016