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

Commit 3c26181c authored by Richard Alpe's avatar Richard Alpe Committed by David S. Miller
Browse files

tipc: convert legacy nl net id get to nl compat



Convert TIPC_CMD_GET_NETID 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 964f9501
Loading
Loading
Loading
Loading
+0 −23
Original line number Original line Diff line number Diff line
@@ -72,25 +72,6 @@ int tipc_cfg_append_tlv(struct sk_buff *buf, int tlv_type,
	return 1;
	return 1;
}
}


static struct sk_buff *tipc_cfg_reply_unsigned_type(u16 tlv_type, u32 value)
{
	struct sk_buff *buf;
	__be32 value_net;

	buf = tipc_cfg_reply_alloc(TLV_SPACE(sizeof(value)));
	if (buf) {
		value_net = htonl(value);
		tipc_cfg_append_tlv(buf, tlv_type, &value_net,
				    sizeof(value_net));
	}
	return buf;
}

static struct sk_buff *tipc_cfg_reply_unsigned(u32 value)
{
	return tipc_cfg_reply_unsigned_type(TIPC_TLV_UNSIGNED, value);
}

struct sk_buff *tipc_cfg_reply_string_type(u16 tlv_type, char *string)
struct sk_buff *tipc_cfg_reply_string_type(u16 tlv_type, char *string)
{
{
	struct sk_buff *buf;
	struct sk_buff *buf;
@@ -139,7 +120,6 @@ struct sk_buff *tipc_cfg_do_cmd(struct net *net, u32 orig_node, u16 cmd,
				int reply_headroom)
				int reply_headroom)
{
{
	struct sk_buff *rep_tlv_buf;
	struct sk_buff *rep_tlv_buf;
	struct tipc_net *tn = net_generic(net, tipc_net_id);


	rtnl_lock();
	rtnl_lock();


@@ -165,9 +145,6 @@ struct sk_buff *tipc_cfg_do_cmd(struct net *net, u32 orig_node, u16 cmd,
	case TIPC_CMD_SHOW_STATS:
	case TIPC_CMD_SHOW_STATS:
		rep_tlv_buf = tipc_show_stats();
		rep_tlv_buf = tipc_show_stats();
		break;
		break;
	case TIPC_CMD_GET_NETID:
		rep_tlv_buf = tipc_cfg_reply_unsigned(tn->net_id);
		break;
	case TIPC_CMD_NOT_NET_ADMIN:
	case TIPC_CMD_NOT_NET_ADMIN:
		rep_tlv_buf =
		rep_tlv_buf =
			tipc_cfg_reply_error_string(TIPC_CFG_NOT_NET_ADMIN);
			tipc_cfg_reply_error_string(TIPC_CFG_NOT_NET_ADMIN);
+18 −0
Original line number Original line Diff line number Diff line
@@ -876,6 +876,18 @@ static int tipc_nl_compat_net_set(struct sk_buff *skb,
	return 0;
	return 0;
}
}


static int tipc_nl_compat_net_dump(struct tipc_nl_compat_msg *msg,
				   struct nlattr **attrs)
{
	__be32 id;
	struct nlattr *net[TIPC_NLA_NET_MAX + 1];

	nla_parse_nested(net, TIPC_NLA_NET_MAX, attrs[TIPC_NLA_NET], NULL);
	id = htonl(nla_get_u32(net[TIPC_NLA_NET_ID]));

	return tipc_add_tlv(msg->rep, TIPC_TLV_UNSIGNED, &id, sizeof(id));
}

static int tipc_nl_compat_handle(struct tipc_nl_compat_msg *msg)
static int tipc_nl_compat_handle(struct tipc_nl_compat_msg *msg)
{
{
	struct tipc_nl_compat_cmd_dump dump;
	struct tipc_nl_compat_cmd_dump dump;
@@ -959,6 +971,11 @@ static int tipc_nl_compat_handle(struct tipc_nl_compat_msg *msg)
		doit.doit = tipc_nl_net_set;
		doit.doit = tipc_nl_net_set;
		doit.transcode = tipc_nl_compat_net_set;
		doit.transcode = tipc_nl_compat_net_set;
		return tipc_nl_compat_doit(&doit, msg);
		return tipc_nl_compat_doit(&doit, msg);
	case TIPC_CMD_GET_NETID:
		msg->rep_size = sizeof(u32);
		dump.dumpit = tipc_nl_net_dump;
		dump.format = tipc_nl_compat_net_dump;
		return tipc_nl_compat_dumpit(&dump, msg);
	}
	}


	return -EOPNOTSUPP;
	return -EOPNOTSUPP;
@@ -1070,6 +1087,7 @@ static int tipc_nl_compat_tmp_wrap(struct sk_buff *skb, struct genl_info *info)
	case TIPC_CMD_GET_NODES:
	case TIPC_CMD_GET_NODES:
	case TIPC_CMD_SET_NODE_ADDR:
	case TIPC_CMD_SET_NODE_ADDR:
	case TIPC_CMD_SET_NETID:
	case TIPC_CMD_SET_NETID:
	case TIPC_CMD_GET_NETID:
		return tipc_nl_compat_recv(skb, info);
		return tipc_nl_compat_recv(skb, info);
	}
	}