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

Commit d4ef3835 authored by Arushi Singhal's avatar Arushi Singhal Committed by Pablo Neira Ayuso
Browse files

netfilter: Remove exceptional & on function name 



Remove & from function pointers to conform to the style found elsewhere
in the file. Done using the following semantic patch

// <smpl>
@r@
identifier f;
@@

f(...) { ... }
@@
identifier r.f;
@@

- &f
+ f
// </smpl>

Signed-off-by: default avatarArushi Singhal <arushisinghal19971997@gmail.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent cbbb40e2

net/bridge/netfilter/nft_meta_bridge.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ nft_meta_bridge_select_ops(const struct nft_ctx *ctx, 
static struct nft_expr_type nft_meta_bridge_type __read_mostly = {

	.family         = NFPROTO_BRIDGE,

	.name           = "meta",

	.select_ops     = &nft_meta_bridge_select_ops,

	.select_ops     = nft_meta_bridge_select_ops,

	.policy         = nft_meta_policy,

	.maxattr        = NFTA_META_MAX,

	.owner          = THIS_MODULE,

net/ipv4/netfilter/nft_fib_ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ nft_fib4_select_ops(const struct nft_ctx *ctx, 


static struct nft_expr_type nft_fib4_type __read_mostly = {

	.name		= "fib",

	.select_ops	= &nft_fib4_select_ops,

	.select_ops	= nft_fib4_select_ops,

	.policy		= nft_fib_policy,

	.maxattr	= NFTA_FIB_MAX,

	.family		= NFPROTO_IPV4,

net/ipv6/netfilter/nft_fib_ipv6.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ nft_fib6_select_ops(const struct nft_ctx *ctx, 


static struct nft_expr_type nft_fib6_type __read_mostly = {

	.name		= "fib",

	.select_ops	= &nft_fib6_select_ops,

	.select_ops	= nft_fib6_select_ops,

	.policy		= nft_fib_policy,

	.maxattr	= NFTA_FIB_MAX,

	.family		= NFPROTO_IPV6,

net/netfilter/ipset/ip_set_core.c

+1 −1
Original line number Diff line number Diff line
@@ -2013,7 +2013,7 @@ static struct nf_sockopt_ops so_set __read_mostly = { 
	.pf		= PF_INET,

	.get_optmin	= SO_IP_SET,

	.get_optmax	= SO_IP_SET + 1,

	.get		= &ip_set_sockfn_get,

	.get		= ip_set_sockfn_get,

	.owner		= THIS_MODULE,

};

net/netfilter/ipvs/ip_vs_ctl.c

+2 −2
Original line number Diff line number Diff line
@@ -1774,13 +1774,13 @@ static struct ctl_table vs_vars[] = { 
		.procname	= "sync_version",

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_do_sync_mode,

		.proc_handler	= proc_do_sync_mode,

	},

	{

		.procname	= "sync_ports",

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_do_sync_ports,

		.proc_handler	= proc_do_sync_ports,

	},

	{

		.procname	= "sync_persist_mode",