Commit c2568c8c authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-Constify-struct-genl_small_ops' 



Rikard Falkeborn says:

====================
net: Constify struct genl_small_ops

Make a couple of static struct genl_small_ops const to allow the compiler
to put them in read-only memory. Patches are independent.

v2: Rebase on net-next, genl_ops -> genl_small_ops
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f5083d0c b980b313

net/mptcp/pm_netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -1054,7 +1054,7 @@ fail: 
	return -EMSGSIZE;

}



static struct genl_small_ops mptcp_pm_ops[] = {

static const struct genl_small_ops mptcp_pm_ops[] = {

	{

		.cmd    = MPTCP_PM_CMD_ADD_ADDR,

		.doit   = mptcp_nl_cmd_add_addr,

net/openvswitch/conntrack.c

+1 −1
Original line number Diff line number Diff line
@@ -2231,7 +2231,7 @@ exit_err: 
	return err;

}



static struct genl_small_ops ct_limit_genl_ops[] = {

static const struct genl_small_ops ct_limit_genl_ops[] = {

	{ .cmd = OVS_CT_LIMIT_CMD_SET,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN

net/openvswitch/meter.c

+1 −1
Original line number Diff line number Diff line
@@ -672,7 +672,7 @@ bool ovs_meter_execute(struct datapath *dp, struct sk_buff *skb, 
	return false;

}



static struct genl_small_ops dp_meter_genl_ops[] = {

static const struct genl_small_ops dp_meter_genl_ops[] = {

	{ .cmd = OVS_METER_CMD_FEATURES,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.flags = 0,		  /* OK for unprivileged users. */

CRA Git | Maintained and supported by SUSTech CRA and CCSE