Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bfc335a authored by Richard Alpe's avatar Richard Alpe Committed by David S. Miller
Browse files

tipc: convert legacy nl media dump to nl compat 



Convert TIPC_CMD_GET_MEDIA_NAMES to compat dumpit.

Signed-off-by: default avatarRichard Alpe <richard.alpe@ericsson.com>
Reviewed-by: default avatarErik Hugne <erik.hugne@ericsson.com>
Reviewed-by: default avatarYing Xue <ying.xue@windriver.com>
Reviewed-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 487d2a3a

net/tipc/bearer.c

+0 −20
Original line number Diff line number Diff line
@@ -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

net/tipc/bearer.h

+0 −1
Original line number Diff line number Diff line
@@ -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,

net/tipc/config.c

+0 −3
Original line number Diff line number Diff line
@@ -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;

net/tipc/netlink_compat.c

+19 −0
Original line number Diff line number Diff line
@@ -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);

	}