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

Commit b54452b0 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller
Browse files

const: struct nla_policy 



Make remaining netlink policies as const.
Fixup coding style where needed.

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3ffe533c

include/net/netlink.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -196,7 +196,7 @@ enum { 
 *    All other            Exact length of attribute payload

 *    All other            Exact length of attribute payload

 *

 *

 * Example:

 * Example:

 * static struct nla_policy my_policy[ATTR_MAX+1] __read_mostly = {

 * static const struct nla_policy my_policy[ATTR_MAX+1] = {

 * 	[ATTR_FOO] = { .type = NLA_U16 },

 * 	[ATTR_FOO] = { .type = NLA_U16 },

 *	[ATTR_BAR] = { .type = NLA_STRING, .len = BARSIZ },

 *	[ATTR_BAR] = { .type = NLA_STRING, .len = BARSIZ },

 *	[ATTR_BAZ] = { .len = sizeof(struct mystruct) },

 *	[ATTR_BAZ] = { .len = sizeof(struct mystruct) },

kernel/taskstats.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -46,15 +46,13 @@ static struct genl_family family = { 
	.maxattr	= TASKSTATS_CMD_ATTR_MAX,

	.maxattr	= TASKSTATS_CMD_ATTR_MAX,

};

};





static struct nla_policy taskstats_cmd_get_policy[TASKSTATS_CMD_ATTR_MAX+1]

static const struct nla_policy taskstats_cmd_get_policy[TASKSTATS_CMD_ATTR_MAX+1] = {

__read_mostly = {

	[TASKSTATS_CMD_ATTR_PID]  = { .type = NLA_U32 },

	[TASKSTATS_CMD_ATTR_PID]  = { .type = NLA_U32 },

	[TASKSTATS_CMD_ATTR_TGID] = { .type = NLA_U32 },

	[TASKSTATS_CMD_ATTR_TGID] = { .type = NLA_U32 },

	[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK] = { .type = NLA_STRING },

	[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK] = { .type = NLA_STRING },

	[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK] = { .type = NLA_STRING },};

	[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK] = { .type = NLA_STRING },};





static struct nla_policy

static const struct nla_policy cgroupstats_cmd_get_policy[CGROUPSTATS_CMD_ATTR_MAX+1] = {

cgroupstats_cmd_get_policy[CGROUPSTATS_CMD_ATTR_MAX+1] __read_mostly = {

	[CGROUPSTATS_CMD_ATTR_FD] = { .type = NLA_U32 },

	[CGROUPSTATS_CMD_ATTR_FD] = { .type = NLA_U32 },

};

};

net/dcb/dcbnl.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -54,7 +54,7 @@ MODULE_LICENSE("GPL"); 
/**************** DCB attribute policies *************************************/

/**************** DCB attribute policies *************************************/





/* DCB netlink attributes policy */

/* DCB netlink attributes policy */

static struct nla_policy dcbnl_rtnl_policy[DCB_ATTR_MAX + 1] = {

static const struct nla_policy dcbnl_rtnl_policy[DCB_ATTR_MAX + 1] = {

	[DCB_ATTR_IFNAME]      = {.type = NLA_NUL_STRING, .len = IFNAMSIZ - 1},

	[DCB_ATTR_IFNAME]      = {.type = NLA_NUL_STRING, .len = IFNAMSIZ - 1},

	[DCB_ATTR_STATE]       = {.type = NLA_U8},

	[DCB_ATTR_STATE]       = {.type = NLA_U8},

	[DCB_ATTR_PFC_CFG]     = {.type = NLA_NESTED},

	[DCB_ATTR_PFC_CFG]     = {.type = NLA_NESTED},
@@ -68,7 +68,7 @@ static struct nla_policy dcbnl_rtnl_policy[DCB_ATTR_MAX + 1] = { 
};

};





/* DCB priority flow control to User Priority nested attributes */

/* DCB priority flow control to User Priority nested attributes */

static struct nla_policy dcbnl_pfc_up_nest[DCB_PFC_UP_ATTR_MAX + 1] = {

static const struct nla_policy dcbnl_pfc_up_nest[DCB_PFC_UP_ATTR_MAX + 1] = {

	[DCB_PFC_UP_ATTR_0]   = {.type = NLA_U8},

	[DCB_PFC_UP_ATTR_0]   = {.type = NLA_U8},

	[DCB_PFC_UP_ATTR_1]   = {.type = NLA_U8},

	[DCB_PFC_UP_ATTR_1]   = {.type = NLA_U8},

	[DCB_PFC_UP_ATTR_2]   = {.type = NLA_U8},

	[DCB_PFC_UP_ATTR_2]   = {.type = NLA_U8},
@@ -81,7 +81,7 @@ static struct nla_policy dcbnl_pfc_up_nest[DCB_PFC_UP_ATTR_MAX + 1] = { 
};

};





/* DCB priority grouping nested attributes */

/* DCB priority grouping nested attributes */

static struct nla_policy dcbnl_pg_nest[DCB_PG_ATTR_MAX + 1] = {

static const struct nla_policy dcbnl_pg_nest[DCB_PG_ATTR_MAX + 1] = {

	[DCB_PG_ATTR_TC_0]      = {.type = NLA_NESTED},

	[DCB_PG_ATTR_TC_0]      = {.type = NLA_NESTED},

	[DCB_PG_ATTR_TC_1]      = {.type = NLA_NESTED},

	[DCB_PG_ATTR_TC_1]      = {.type = NLA_NESTED},

	[DCB_PG_ATTR_TC_2]      = {.type = NLA_NESTED},

	[DCB_PG_ATTR_TC_2]      = {.type = NLA_NESTED},
@@ -103,7 +103,7 @@ static struct nla_policy dcbnl_pg_nest[DCB_PG_ATTR_MAX + 1] = { 
};

};





/* DCB traffic class nested attributes. */

/* DCB traffic class nested attributes. */

static struct nla_policy dcbnl_tc_param_nest[DCB_TC_ATTR_PARAM_MAX + 1] = {

static const struct nla_policy dcbnl_tc_param_nest[DCB_TC_ATTR_PARAM_MAX + 1] = {

	[DCB_TC_ATTR_PARAM_PGID]            = {.type = NLA_U8},

	[DCB_TC_ATTR_PARAM_PGID]            = {.type = NLA_U8},

	[DCB_TC_ATTR_PARAM_UP_MAPPING]      = {.type = NLA_U8},

	[DCB_TC_ATTR_PARAM_UP_MAPPING]      = {.type = NLA_U8},

	[DCB_TC_ATTR_PARAM_STRICT_PRIO]     = {.type = NLA_U8},

	[DCB_TC_ATTR_PARAM_STRICT_PRIO]     = {.type = NLA_U8},
@@ -112,7 +112,7 @@ static struct nla_policy dcbnl_tc_param_nest[DCB_TC_ATTR_PARAM_MAX + 1] = { 
};

};





/* DCB capabilities nested attributes. */

/* DCB capabilities nested attributes. */

static struct nla_policy dcbnl_cap_nest[DCB_CAP_ATTR_MAX + 1] = {

static const struct nla_policy dcbnl_cap_nest[DCB_CAP_ATTR_MAX + 1] = {

	[DCB_CAP_ATTR_ALL]     = {.type = NLA_FLAG},

	[DCB_CAP_ATTR_ALL]     = {.type = NLA_FLAG},

	[DCB_CAP_ATTR_PG]      = {.type = NLA_U8},

	[DCB_CAP_ATTR_PG]      = {.type = NLA_U8},

	[DCB_CAP_ATTR_PFC]     = {.type = NLA_U8},

	[DCB_CAP_ATTR_PFC]     = {.type = NLA_U8},
@@ -124,14 +124,14 @@ static struct nla_policy dcbnl_cap_nest[DCB_CAP_ATTR_MAX + 1] = { 
};

};





/* DCB capabilities nested attributes. */

/* DCB capabilities nested attributes. */

static struct nla_policy dcbnl_numtcs_nest[DCB_NUMTCS_ATTR_MAX + 1] = {

static const struct nla_policy dcbnl_numtcs_nest[DCB_NUMTCS_ATTR_MAX + 1] = {

	[DCB_NUMTCS_ATTR_ALL]     = {.type = NLA_FLAG},

	[DCB_NUMTCS_ATTR_ALL]     = {.type = NLA_FLAG},

	[DCB_NUMTCS_ATTR_PG]      = {.type = NLA_U8},

	[DCB_NUMTCS_ATTR_PG]      = {.type = NLA_U8},

	[DCB_NUMTCS_ATTR_PFC]     = {.type = NLA_U8},

	[DCB_NUMTCS_ATTR_PFC]     = {.type = NLA_U8},

};

};





/* DCB BCN nested attributes. */

/* DCB BCN nested attributes. */

static struct nla_policy dcbnl_bcn_nest[DCB_BCN_ATTR_MAX + 1] = {

static const struct nla_policy dcbnl_bcn_nest[DCB_BCN_ATTR_MAX + 1] = {

	[DCB_BCN_ATTR_RP_0]         = {.type = NLA_U8},

	[DCB_BCN_ATTR_RP_0]         = {.type = NLA_U8},

	[DCB_BCN_ATTR_RP_1]         = {.type = NLA_U8},

	[DCB_BCN_ATTR_RP_1]         = {.type = NLA_U8},

	[DCB_BCN_ATTR_RP_2]         = {.type = NLA_U8},

	[DCB_BCN_ATTR_RP_2]         = {.type = NLA_U8},
@@ -160,7 +160,7 @@ static struct nla_policy dcbnl_bcn_nest[DCB_BCN_ATTR_MAX + 1] = { 
};

};





/* DCB APP nested attributes. */

/* DCB APP nested attributes. */

static struct nla_policy dcbnl_app_nest[DCB_APP_ATTR_MAX + 1] = {

static const struct nla_policy dcbnl_app_nest[DCB_APP_ATTR_MAX + 1] = {

	[DCB_APP_ATTR_IDTYPE]       = {.type = NLA_U8},

	[DCB_APP_ATTR_IDTYPE]       = {.type = NLA_U8},

	[DCB_APP_ATTR_ID]           = {.type = NLA_U16},

	[DCB_APP_ATTR_ID]           = {.type = NLA_U16},

	[DCB_APP_ATTR_PRIORITY]     = {.type = NLA_U8},

	[DCB_APP_ATTR_PRIORITY]     = {.type = NLA_U8},

net/irda/irnetlink.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -124,7 +124,7 @@ static int irda_nl_get_mode(struct sk_buff *skb, struct genl_info *info) 
	return ret;

	return ret;

}

}





static struct nla_policy irda_nl_policy[IRDA_NL_ATTR_MAX + 1] = {

static const struct nla_policy irda_nl_policy[IRDA_NL_ATTR_MAX + 1] = {

	[IRDA_NL_ATTR_IFNAME] = { .type = NLA_NUL_STRING,

	[IRDA_NL_ATTR_IFNAME] = { .type = NLA_NUL_STRING,

				  .len = IFNAMSIZ-1 },

				  .len = IFNAMSIZ-1 },

	[IRDA_NL_ATTR_MODE] = { .type = NLA_U32 },

	[IRDA_NL_ATTR_MODE] = { .type = NLA_U32 },

net/wimax/op-msg.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -320,8 +320,7 @@ int wimax_msg(struct wimax_dev *wimax_dev, const char *pipe_name, 
EXPORT_SYMBOL_GPL(wimax_msg);

EXPORT_SYMBOL_GPL(wimax_msg);









static const

static const struct nla_policy wimax_gnl_msg_policy[WIMAX_GNL_ATTR_MAX + 1] = {

struct nla_policy wimax_gnl_msg_policy[WIMAX_GNL_ATTR_MAX + 1] = {

	[WIMAX_GNL_MSG_IFIDX] = {

	[WIMAX_GNL_MSG_IFIDX] = {

		.type = NLA_U32,

		.type = NLA_U32,

	},

	},