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

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
...@@ -111,7 +111,7 @@ nft_meta_bridge_select_ops(const struct nft_ctx *ctx, ...@@ -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 = { static struct nft_expr_type nft_meta_bridge_type __read_mostly = {
.family = NFPROTO_BRIDGE, .family = NFPROTO_BRIDGE,
.name = "meta", .name = "meta",
.select_ops = &nft_meta_bridge_select_ops, .select_ops = nft_meta_bridge_select_ops,
.policy = nft_meta_policy, .policy = nft_meta_policy,
.maxattr = NFTA_META_MAX, .maxattr = NFTA_META_MAX,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
...@@ -212,7 +212,7 @@ nft_fib4_select_ops(const struct nft_ctx *ctx, ...@@ -212,7 +212,7 @@ nft_fib4_select_ops(const struct nft_ctx *ctx,
static struct nft_expr_type nft_fib4_type __read_mostly = { static struct nft_expr_type nft_fib4_type __read_mostly = {
.name = "fib", .name = "fib",
.select_ops = &nft_fib4_select_ops, .select_ops = nft_fib4_select_ops,
.policy = nft_fib_policy, .policy = nft_fib_policy,
.maxattr = NFTA_FIB_MAX, .maxattr = NFTA_FIB_MAX,
.family = NFPROTO_IPV4, .family = NFPROTO_IPV4,
......
...@@ -246,7 +246,7 @@ nft_fib6_select_ops(const struct nft_ctx *ctx, ...@@ -246,7 +246,7 @@ nft_fib6_select_ops(const struct nft_ctx *ctx,
static struct nft_expr_type nft_fib6_type __read_mostly = { static struct nft_expr_type nft_fib6_type __read_mostly = {
.name = "fib", .name = "fib",
.select_ops = &nft_fib6_select_ops, .select_ops = nft_fib6_select_ops,
.policy = nft_fib_policy, .policy = nft_fib_policy,
.maxattr = NFTA_FIB_MAX, .maxattr = NFTA_FIB_MAX,
.family = NFPROTO_IPV6, .family = NFPROTO_IPV6,
......
...@@ -2013,7 +2013,7 @@ static struct nf_sockopt_ops so_set __read_mostly = { ...@@ -2013,7 +2013,7 @@ static struct nf_sockopt_ops so_set __read_mostly = {
.pf = PF_INET, .pf = PF_INET,
.get_optmin = SO_IP_SET, .get_optmin = SO_IP_SET,
.get_optmax = SO_IP_SET + 1, .get_optmax = SO_IP_SET + 1,
.get = &ip_set_sockfn_get, .get = ip_set_sockfn_get,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
......
...@@ -1774,13 +1774,13 @@ static struct ctl_table vs_vars[] = { ...@@ -1774,13 +1774,13 @@ static struct ctl_table vs_vars[] = {
.procname = "sync_version", .procname = "sync_version",
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_do_sync_mode, .proc_handler = proc_do_sync_mode,
}, },
{ {
.procname = "sync_ports", .procname = "sync_ports",
.maxlen = sizeof(int), .maxlen = sizeof(int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_do_sync_ports, .proc_handler = proc_do_sync_ports,
}, },
{ {
.procname = "sync_persist_mode", .procname = "sync_persist_mode",
......
...@@ -500,7 +500,7 @@ static void nfnetlink_rcv(struct sk_buff *skb) ...@@ -500,7 +500,7 @@ static void nfnetlink_rcv(struct sk_buff *skb)
if (nlh->nlmsg_type == NFNL_MSG_BATCH_BEGIN) if (nlh->nlmsg_type == NFNL_MSG_BATCH_BEGIN)
nfnetlink_rcv_skb_batch(skb, nlh); nfnetlink_rcv_skb_batch(skb, nlh);
else else
netlink_rcv_skb(skb, &nfnetlink_rcv_msg); netlink_rcv_skb(skb, nfnetlink_rcv_msg);
} }
#ifdef CONFIG_MODULES #ifdef CONFIG_MODULES
......
...@@ -803,7 +803,7 @@ static int nfulnl_recv_unsupp(struct net *net, struct sock *ctnl, ...@@ -803,7 +803,7 @@ static int nfulnl_recv_unsupp(struct net *net, struct sock *ctnl,
static struct nf_logger nfulnl_logger __read_mostly = { static struct nf_logger nfulnl_logger __read_mostly = {
.name = "nfnetlink_log", .name = "nfnetlink_log",
.type = NF_LOG_TYPE_ULOG, .type = NF_LOG_TYPE_ULOG,
.logfn = &nfulnl_log_packet, .logfn = nfulnl_log_packet,
.me = THIS_MODULE, .me = THIS_MODULE,
}; };
......
...@@ -1213,8 +1213,8 @@ static const struct nla_policy nfqa_cfg_policy[NFQA_CFG_MAX+1] = { ...@@ -1213,8 +1213,8 @@ static const struct nla_policy nfqa_cfg_policy[NFQA_CFG_MAX+1] = {
}; };
static const struct nf_queue_handler nfqh = { static const struct nf_queue_handler nfqh = {
.outfn = &nfqnl_enqueue_packet, .outfn = nfqnl_enqueue_packet,
.nf_hook_drop = &nfqnl_nf_hook_drop, .nf_hook_drop = nfqnl_nf_hook_drop,
}; };
static int nfqnl_recv_config(struct net *net, struct sock *ctnl, static int nfqnl_recv_config(struct net *net, struct sock *ctnl,
......
...@@ -702,7 +702,7 @@ nft_ct_select_ops(const struct nft_ctx *ctx, ...@@ -702,7 +702,7 @@ nft_ct_select_ops(const struct nft_ctx *ctx,
static struct nft_expr_type nft_ct_type __read_mostly = { static struct nft_expr_type nft_ct_type __read_mostly = {
.name = "ct", .name = "ct",
.select_ops = &nft_ct_select_ops, .select_ops = nft_ct_select_ops,
.policy = nft_ct_policy, .policy = nft_ct_policy,
.maxattr = NFTA_CT_MAX, .maxattr = NFTA_CT_MAX,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
...@@ -232,7 +232,7 @@ nft_exthdr_select_ops(const struct nft_ctx *ctx, ...@@ -232,7 +232,7 @@ nft_exthdr_select_ops(const struct nft_ctx *ctx,
static struct nft_expr_type nft_exthdr_type __read_mostly = { static struct nft_expr_type nft_exthdr_type __read_mostly = {
.name = "exthdr", .name = "exthdr",
.select_ops = &nft_exthdr_select_ops, .select_ops = nft_exthdr_select_ops,
.policy = nft_exthdr_policy, .policy = nft_exthdr_policy,
.maxattr = NFTA_EXTHDR_MAX, .maxattr = NFTA_EXTHDR_MAX,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
...@@ -224,7 +224,7 @@ nft_hash_select_ops(const struct nft_ctx *ctx, ...@@ -224,7 +224,7 @@ nft_hash_select_ops(const struct nft_ctx *ctx,
static struct nft_expr_type nft_hash_type __read_mostly = { static struct nft_expr_type nft_hash_type __read_mostly = {
.name = "hash", .name = "hash",
.select_ops = &nft_hash_select_ops, .select_ops = nft_hash_select_ops,
.policy = nft_hash_policy, .policy = nft_hash_policy,
.maxattr = NFTA_HASH_MAX, .maxattr = NFTA_HASH_MAX,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
...@@ -467,7 +467,7 @@ nft_meta_select_ops(const struct nft_ctx *ctx, ...@@ -467,7 +467,7 @@ nft_meta_select_ops(const struct nft_ctx *ctx,
static struct nft_expr_type nft_meta_type __read_mostly = { static struct nft_expr_type nft_meta_type __read_mostly = {
.name = "meta", .name = "meta",
.select_ops = &nft_meta_select_ops, .select_ops = nft_meta_select_ops,
.policy = nft_meta_policy, .policy = nft_meta_policy,
.maxattr = NFTA_META_MAX, .maxattr = NFTA_META_MAX,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
...@@ -188,7 +188,7 @@ nft_ng_select_ops(const struct nft_ctx *ctx, const struct nlattr * const tb[]) ...@@ -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 = { static struct nft_expr_type nft_ng_type __read_mostly = {
.name = "numgen", .name = "numgen",
.select_ops = &nft_ng_select_ops, .select_ops = nft_ng_select_ops,
.policy = nft_ng_policy, .policy = nft_ng_policy,
.maxattr = NFTA_NG_MAX, .maxattr = NFTA_NG_MAX,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
...@@ -197,7 +197,7 @@ nft_queue_select_ops(const struct nft_ctx *ctx, ...@@ -197,7 +197,7 @@ nft_queue_select_ops(const struct nft_ctx *ctx,
static struct nft_expr_type nft_queue_type __read_mostly = { static struct nft_expr_type nft_queue_type __read_mostly = {
.name = "queue", .name = "queue",
.select_ops = &nft_queue_select_ops, .select_ops = nft_queue_select_ops,
.policy = nft_queue_policy, .policy = nft_queue_policy,
.maxattr = NFTA_QUEUE_MAX, .maxattr = NFTA_QUEUE_MAX,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment