Re: [PATCH 1/4] net: netfilter:Remove exceptional & on function name

[Pablo Neira Ayuso]

On Sun, Apr 02, 2017 at 02:52:12PM +0530, Arushi Singhal wrote:
> Remove & from function pointers to conform to the style found elsewhere
> in the file. Done using the following semantic patch
> 
> // 
> @r@
> identifier f;
> @@
> 
> f(...) { ... }
> @@
> identifier r.f;
> @@
> 
> - 
> + f
> // 

I have collapsed these four patches.

You only need to send one patch per logical update.

I also detected that you missed one spot in nft_hash.c, I manually
updated this but next time you have to be more careful.

Thanks!
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 1/4] net: netfilter:Remove exceptional & on function name

[Arushi Singhal]

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

// 
@r@
identifier f;
@@

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

- 
+ f
// 

Signed-off-by: Arushi Singhal 
---
 net/netfilter/ipset/ip_set_core.c | 2 +-
 net/netfilter/ipvs/ip_vs_ctl.c| 4 ++--
 net/netfilter/nfnetlink.c | 2 +-
 net/netfilter/nfnetlink_log.c | 2 +-
 net/netfilter/nfnetlink_queue.c   | 4 ++--
 net/netfilter/nft_ct.c| 2 +-
 net/netfilter/nft_exthdr.c| 2 +-
 net/netfilter/nft_meta.c  | 2 +-
 net/netfilter/nft_numgen.c| 2 +-
 net/netfilter/nft_queue.c | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/net/netfilter/ipset/ip_set_core.c 
b/net/netfilter/ipset/ip_set_core.c
index c296f9b606d4..14f748b0bd17 100644
--- a/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c
@@ -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= _set_sockfn_get,
+   .get= ip_set_sockfn_get,
.owner  = THIS_MODULE,
 };
 
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index 5aeb0dde6ccc..23c44b3b7510 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -1774,13 +1774,13 @@ static struct ctl_table vs_vars[] = {
.procname   = "sync_version",
.maxlen = sizeof(int),
.mode   = 0644,
-   .proc_handler   = _do_sync_mode,
+   .proc_handler   = proc_do_sync_mode,
},
{
.procname   = "sync_ports",
.maxlen = sizeof(int),
.mode   = 0644,
-   .proc_handler   = _do_sync_ports,
+   .proc_handler   = proc_do_sync_ports,
},
{
.procname   = "sync_persist_mode",
diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
index 68eda920160e..185f9786a5a4 100644
--- a/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@ -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, _rcv_msg);
+   netlink_rcv_skb(skb, nfnetlink_rcv_msg);
 }
 
 #ifdef CONFIG_MODULES
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index 08247bf7d7b8..436d4dfe3e74 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -801,7 +801,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  = _log_packet,
+   .logfn  = nfulnl_log_packet,
.me = THIS_MODULE,
 };
 
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
index 3ee0b8a000a4..e062ec234091 100644
--- a/net/netfilter/nfnetlink_queue.c
+++ b/net/netfilter/nfnetlink_queue.c
@@ -1208,8 +1208,8 @@ static const struct nla_policy 
nfqa_cfg_policy[NFQA_CFG_MAX+1] = {
 };
 
 static const struct nf_queue_handler nfqh = {
-   .outfn  = _enqueue_packet,
-   .nf_hook_drop   = _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,
diff --git a/net/netfilter/nft_ct.c b/net/netfilter/nft_ct.c
index 0264258c46fe..08f01d0853ef 100644
--- a/net/netfilter/nft_ct.c
+++ b/net/netfilter/nft_ct.c
@@ -696,7 +696,7 @@ nft_ct_select_ops(const struct nft_ctx *ctx,
 
 static struct nft_expr_type nft_ct_type __read_mostly = {
.name   = "ct",
-   .select_ops = _ct_select_ops,
+   .select_ops = nft_ct_select_ops,
.policy = nft_ct_policy,
.maxattr= NFTA_CT_MAX,
.owner  = THIS_MODULE,
diff --git a/net/netfilter/nft_exthdr.c b/net/netfilter/nft_exthdr.c
index c308920b194c..9137721dd3b4 100644
--- a/net/netfilter/nft_exthdr.c
+++ b/net/netfilter/nft_exthdr.c
@@ -225,7 +225,7 @@ nft_exthdr_select_ops(const struct nft_ctx *ctx,
 
 static struct nft_expr_type nft_exthdr_type __read_mostly = {
.name   = "exthdr",
-   .select_ops = _exthdr_select_ops,
+   .select_ops = nft_exthdr_select_ops,
.policy = nft_exthdr_policy,
.maxattr= NFTA_EXTHDR_MAX,
.owner  = THIS_MODULE,
diff --git a/net/netfilter/nft_meta.c b/net/netfilter/nft_meta.c
index 7b60e01f38ff..f2520a6a388d 100644
--- a/net/netfilter/nft_meta.c
+++ b/net/netfilter/nft_meta.c
@@ -471,7 +471,7 @@ nft_meta_select_ops(const struct