Commit 5028588b authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

ethtool: wire up set policies to ops 



Similarly to get commands wire up the policies of set commands
to get parsing by the core and policy dumps.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4f30974f

net/ethtool/cabletest.c

+6 −18
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ 
 */

#define MAX_CABLE_LENGTH_CM (150 * 100)



static const struct nla_policy

cable_test_act_policy[ETHTOOL_A_CABLE_TEST_MAX + 1] = {

const struct nla_policy

ethnl_cable_test_act_policy[ETHTOOL_A_CABLE_TEST_MAX + 1] = {

	[ETHTOOL_A_CABLE_TEST_UNSPEC]		= { .type = NLA_REJECT },

	[ETHTOOL_A_CABLE_TEST_HEADER]		= { .type = NLA_NESTED },

};
@@ -56,18 +56,12 @@ static int ethnl_cable_test_started(struct phy_device *phydev, u8 cmd) 


int ethnl_act_cable_test(struct sk_buff *skb, struct genl_info *info)

{

	struct nlattr *tb[ETHTOOL_A_CABLE_TEST_MAX + 1];

	struct ethnl_req_info req_info = {};

	const struct ethtool_phy_ops *ops;

	struct nlattr **tb = info->attrs;

	struct net_device *dev;

	int ret;



	ret = nlmsg_parse(info->nlhdr, GENL_HDRLEN, tb,

			  ETHTOOL_A_CABLE_TEST_MAX,

			  cable_test_act_policy, info->extack);

	if (ret < 0)

		return ret;



	ret = ethnl_parse_header_dev_get(&req_info,

					 tb[ETHTOOL_A_CABLE_TEST_HEADER],

					 genl_info_net(info), info->extack,
@@ -226,8 +220,8 @@ cable_test_tdr_act_cfg_policy[ETHTOOL_A_CABLE_TEST_TDR_CFG_MAX + 1] = { 
	[ETHTOOL_A_CABLE_TEST_TDR_CFG_PAIR]	= { .type = NLA_U8 },

};



static const struct nla_policy

cable_test_tdr_act_policy[ETHTOOL_A_CABLE_TEST_TDR_MAX + 1] = {

const struct nla_policy

ethnl_cable_test_tdr_act_policy[ETHTOOL_A_CABLE_TEST_TDR_MAX + 1] = {

	[ETHTOOL_A_CABLE_TEST_TDR_UNSPEC]	= { .type = NLA_REJECT },

	[ETHTOOL_A_CABLE_TEST_TDR_HEADER]	= { .type = NLA_NESTED },

	[ETHTOOL_A_CABLE_TEST_TDR_CFG]		= { .type = NLA_NESTED },
@@ -313,19 +307,13 @@ static int ethnl_act_cable_test_tdr_cfg(const struct nlattr *nest, 


int ethnl_act_cable_test_tdr(struct sk_buff *skb, struct genl_info *info)

{

	struct nlattr *tb[ETHTOOL_A_CABLE_TEST_TDR_MAX + 1];

	struct ethnl_req_info req_info = {};

	const struct ethtool_phy_ops *ops;

	struct nlattr **tb = info->attrs;

	struct phy_tdr_config cfg;

	struct net_device *dev;

	int ret;



	ret = nlmsg_parse(info->nlhdr, GENL_HDRLEN, tb,

			  ETHTOOL_A_CABLE_TEST_TDR_MAX,

			  cable_test_tdr_act_policy, info->extack);

	if (ret < 0)

		return ret;



	ret = ethnl_parse_header_dev_get(&req_info,

					 tb[ETHTOOL_A_CABLE_TEST_TDR_HEADER],

					 genl_info_net(info), info->extack,

net/ethtool/channels.c

+3 −8
Original line number Diff line number Diff line
@@ -109,8 +109,8 @@ const struct ethnl_request_ops ethnl_channels_request_ops = { 


/* CHANNELS_SET */



static const struct nla_policy

channels_set_policy[ETHTOOL_A_CHANNELS_MAX + 1] = {

const struct nla_policy

ethnl_channels_set_policy[ETHTOOL_A_CHANNELS_MAX + 1] = {

	[ETHTOOL_A_CHANNELS_UNSPEC]		= { .type = NLA_REJECT },

	[ETHTOOL_A_CHANNELS_HEADER]		= { .type = NLA_NESTED },

	[ETHTOOL_A_CHANNELS_RX_MAX]		= { .type = NLA_REJECT },
@@ -125,22 +125,17 @@ channels_set_policy[ETHTOOL_A_CHANNELS_MAX + 1] = { 


int ethnl_set_channels(struct sk_buff *skb, struct genl_info *info)

{

	struct nlattr *tb[ETHTOOL_A_CHANNELS_MAX + 1];

	unsigned int from_channel, old_total, i;

	bool mod = false, mod_combined = false;

	struct ethtool_channels channels = {};

	struct ethnl_req_info req_info = {};

	struct nlattr **tb = info->attrs;

	const struct nlattr *err_attr;

	const struct ethtool_ops *ops;

	struct net_device *dev;

	u32 max_rx_in_use = 0;

	int ret;



	ret = nlmsg_parse(info->nlhdr, GENL_HDRLEN, tb,

			  ETHTOOL_A_CHANNELS_MAX, channels_set_policy,

			  info->extack);

	if (ret < 0)

		return ret;

	ret = ethnl_parse_header_dev_get(&req_info,

					 tb[ETHTOOL_A_CHANNELS_HEADER],

					 genl_info_net(info), info->extack,

net/ethtool/coalesce.c

+3 −8
Original line number Diff line number Diff line
@@ -213,8 +213,8 @@ const struct ethnl_request_ops ethnl_coalesce_request_ops = { 


/* COALESCE_SET */



static const struct nla_policy

coalesce_set_policy[ETHTOOL_A_COALESCE_MAX + 1] = {

const struct nla_policy

ethnl_coalesce_set_policy[ETHTOOL_A_COALESCE_MAX + 1] = {

	[ETHTOOL_A_COALESCE_UNSPEC]		= { .type = NLA_REJECT },

	[ETHTOOL_A_COALESCE_HEADER]		= { .type = NLA_NESTED },

	[ETHTOOL_A_COALESCE_RX_USECS]		= { .type = NLA_U32 },
@@ -243,9 +243,9 @@ coalesce_set_policy[ETHTOOL_A_COALESCE_MAX + 1] = { 


int ethnl_set_coalesce(struct sk_buff *skb, struct genl_info *info)

{

	struct nlattr *tb[ETHTOOL_A_COALESCE_MAX + 1];

	struct ethtool_coalesce coalesce = {};

	struct ethnl_req_info req_info = {};

	struct nlattr **tb = info->attrs;

	const struct ethtool_ops *ops;

	struct net_device *dev;

	u32 supported_params;
@@ -253,11 +253,6 @@ int ethnl_set_coalesce(struct sk_buff *skb, struct genl_info *info) 
	int ret;

	u16 a;



	ret = nlmsg_parse(info->nlhdr, GENL_HDRLEN, tb,

			  ETHTOOL_A_COALESCE_MAX, coalesce_set_policy,

			  info->extack);

	if (ret < 0)

		return ret;

	ret = ethnl_parse_header_dev_get(&req_info,

					 tb[ETHTOOL_A_COALESCE_HEADER],

					 genl_info_net(info), info->extack,

net/ethtool/debug.c

+2 −8
Original line number Diff line number Diff line
@@ -78,8 +78,7 @@ const struct ethnl_request_ops ethnl_debug_request_ops = { 


/* DEBUG_SET */



static const struct nla_policy

debug_set_policy[ETHTOOL_A_DEBUG_MAX + 1] = {

const struct nla_policy ethnl_debug_set_policy[ETHTOOL_A_DEBUG_MAX + 1] = {

	[ETHTOOL_A_DEBUG_UNSPEC]	= { .type = NLA_REJECT },

	[ETHTOOL_A_DEBUG_HEADER]	= { .type = NLA_NESTED },

	[ETHTOOL_A_DEBUG_MSGMASK]	= { .type = NLA_NESTED },
@@ -87,18 +86,13 @@ debug_set_policy[ETHTOOL_A_DEBUG_MAX + 1] = { 


int ethnl_set_debug(struct sk_buff *skb, struct genl_info *info)

{

	struct nlattr *tb[ETHTOOL_A_DEBUG_MAX + 1];

	struct ethnl_req_info req_info = {};

	struct nlattr **tb = info->attrs;

	struct net_device *dev;

	bool mod = false;

	u32 msg_mask;

	int ret;



	ret = nlmsg_parse(info->nlhdr, GENL_HDRLEN, tb,

			  ETHTOOL_A_DEBUG_MAX, debug_set_policy,

			  info->extack);

	if (ret < 0)

		return ret;

	ret = ethnl_parse_header_dev_get(&req_info,

					 tb[ETHTOOL_A_DEBUG_HEADER],

					 genl_info_net(info), info->extack,

net/ethtool/eee.c

+3 −8
Original line number Diff line number Diff line
@@ -128,8 +128,7 @@ const struct ethnl_request_ops ethnl_eee_request_ops = { 


/* EEE_SET */



static const struct nla_policy

eee_set_policy[ETHTOOL_A_EEE_MAX + 1] = {

const struct nla_policy ethnl_eee_set_policy[ETHTOOL_A_EEE_MAX + 1] = {

	[ETHTOOL_A_EEE_UNSPEC]		= { .type = NLA_REJECT },

	[ETHTOOL_A_EEE_HEADER]		= { .type = NLA_NESTED },

	[ETHTOOL_A_EEE_MODES_OURS]	= { .type = NLA_NESTED },
@@ -142,18 +141,14 @@ eee_set_policy[ETHTOOL_A_EEE_MAX + 1] = { 


int ethnl_set_eee(struct sk_buff *skb, struct genl_info *info)

{

	struct nlattr *tb[ETHTOOL_A_EEE_MAX + 1];

	struct ethtool_eee eee = {};

	struct ethnl_req_info req_info = {};

	struct nlattr **tb = info->attrs;

	const struct ethtool_ops *ops;

	struct ethtool_eee eee = {};

	struct net_device *dev;

	bool mod = false;

	int ret;



	ret = nlmsg_parse(info->nlhdr, GENL_HDRLEN, tb, ETHTOOL_A_EEE_MAX,

			  eee_set_policy, info->extack);

	if (ret < 0)

		return ret;

	ret = ethnl_parse_header_dev_get(&req_info,

					 tb[ETHTOOL_A_EEE_HEADER],

					 genl_info_net(info), info->extack,