Skip to content

Commit

Permalink
netfilter: Remove exceptional & on function name
Browse files Browse the repository at this point in the history
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: Arushi Singhal <arushisinghal19971997@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  • Loading branch information
Arushi Singhal authored and Pablo Neira Ayuso committed Apr 7, 2017
1 parent cbbb40e commit d4ef383
Show file tree
Hide file tree
Showing 14 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion net/bridge/netfilter/nft_meta_bridge.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion net/ipv4/netfilter/nft_fib_ipv4.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion net/ipv6/netfilter/nft_fib_ipv6.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion net/netfilter/ipset/ip_set_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};

Expand Down
4 changes: 2 additions & 2 deletions net/netfilter/ipvs/ip_vs_ctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion net/netfilter/nfnetlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ static void nfnetlink_rcv(struct sk_buff *skb)
if (nlh->nlmsg_type == NFNL_MSG_BATCH_BEGIN)
nfnetlink_rcv_skb_batch(skb, nlh);
else
netlink_rcv_skb(skb, &nfnetlink_rcv_msg);
netlink_rcv_skb(skb, nfnetlink_rcv_msg);
}

#ifdef CONFIG_MODULES
Expand Down
2 changes: 1 addition & 1 deletion net/netfilter/nfnetlink_log.c
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,7 @@ static int nfulnl_recv_unsupp(struct net *net, struct sock *ctnl,
static struct nf_logger nfulnl_logger __read_mostly = {
.name = "nfnetlink_log",
.type = NF_LOG_TYPE_ULOG,
.logfn = &nfulnl_log_packet,
.logfn = nfulnl_log_packet,
.me = THIS_MODULE,
};

Expand Down
4 changes: 2 additions & 2 deletions net/netfilter/nfnetlink_queue.c
Original file line number Diff line number Diff line change
Expand Up @@ -1213,8 +1213,8 @@ static const struct nla_policy nfqa_cfg_policy[NFQA_CFG_MAX+1] = {
};

static const struct nf_queue_handler nfqh = {
.outfn = &nfqnl_enqueue_packet,
.nf_hook_drop = &nfqnl_nf_hook_drop,
.outfn = nfqnl_enqueue_packet,
.nf_hook_drop = nfqnl_nf_hook_drop,
};

static int nfqnl_recv_config(struct net *net, struct sock *ctnl,
Expand Down
2 changes: 1 addition & 1 deletion net/netfilter/nft_ct.c
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,7 @@ nft_ct_select_ops(const struct nft_ctx *ctx,

static struct nft_expr_type nft_ct_type __read_mostly = {
.name = "ct",
.select_ops = &nft_ct_select_ops,
.select_ops = nft_ct_select_ops,
.policy = nft_ct_policy,
.maxattr = NFTA_CT_MAX,
.owner = THIS_MODULE,
Expand Down
2 changes: 1 addition & 1 deletion net/netfilter/nft_exthdr.c
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ nft_exthdr_select_ops(const struct nft_ctx *ctx,

static struct nft_expr_type nft_exthdr_type __read_mostly = {
.name = "exthdr",
.select_ops = &nft_exthdr_select_ops,
.select_ops = nft_exthdr_select_ops,
.policy = nft_exthdr_policy,
.maxattr = NFTA_EXTHDR_MAX,
.owner = THIS_MODULE,
Expand Down
2 changes: 1 addition & 1 deletion net/netfilter/nft_hash.c
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ nft_hash_select_ops(const struct nft_ctx *ctx,

static struct nft_expr_type nft_hash_type __read_mostly = {
.name = "hash",
.select_ops = &nft_hash_select_ops,
.select_ops = nft_hash_select_ops,
.policy = nft_hash_policy,
.maxattr = NFTA_HASH_MAX,
.owner = THIS_MODULE,
Expand Down
2 changes: 1 addition & 1 deletion net/netfilter/nft_meta.c
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ nft_meta_select_ops(const struct nft_ctx *ctx,

static struct nft_expr_type nft_meta_type __read_mostly = {
.name = "meta",
.select_ops = &nft_meta_select_ops,
.select_ops = nft_meta_select_ops,
.policy = nft_meta_policy,
.maxattr = NFTA_META_MAX,
.owner = THIS_MODULE,
Expand Down
2 changes: 1 addition & 1 deletion net/netfilter/nft_numgen.c
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ nft_ng_select_ops(const struct nft_ctx *ctx, const struct nlattr * const tb[])

static struct nft_expr_type nft_ng_type __read_mostly = {
.name = "numgen",
.select_ops = &nft_ng_select_ops,
.select_ops = nft_ng_select_ops,
.policy = nft_ng_policy,
.maxattr = NFTA_NG_MAX,
.owner = THIS_MODULE,
Expand Down
2 changes: 1 addition & 1 deletion net/netfilter/nft_queue.c
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ nft_queue_select_ops(const struct nft_ctx *ctx,

static struct nft_expr_type nft_queue_type __read_mostly = {
.name = "queue",
.select_ops = &nft_queue_select_ops,
.select_ops = nft_queue_select_ops,
.policy = nft_queue_policy,
.maxattr = NFTA_QUEUE_MAX,
.owner = THIS_MODULE,
Expand Down

0 comments on commit d4ef383

Please sign in to comment.