netfilter: Remove useless param helper of nf_ct_helper_ext_add

The param helper of nf_ct_helper_ext_add is useless now, then remove
it now.

Signed-off-by: Gao Feng <gfree.wind@vip.163.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/net/netfilter/nf_conntrack_helper.h b/include/net/netfilter/nf_conntrack_helper.h
index 32c2a94a219d603dda33a2247f00a36b56fb786a..2492120b809720d8a685ef80c7d9c496ba5558a7 100644 (file)
--- a/include/net/netfilter/nf_conntrack_helper.h
+++ b/include/net/netfilter/nf_conntrack_helper.h
@@ -103,9 +103,7 @@ int nf_conntrack_helpers_register(struct nf_conntrack_helper *, unsigned int);
 void nf_conntrack_helpers_unregister(struct nf_conntrack_helper *,
                                     unsigned int);
 
-struct nf_conn_help *nf_ct_helper_ext_add(struct nf_conn *ct,
-                                         struct nf_conntrack_helper *helper,
-                                         gfp_t gfp);
+struct nf_conn_help *nf_ct_helper_ext_add(struct nf_conn *ct, gfp_t gfp);
 
 int __nf_ct_try_assign_helper(struct nf_conn *ct, struct nf_conn *tmpl,
                              gfp_t flags);

diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 4ced7c7102b613e4c8549b2022e03fb9d3b3fbca..d97d7e9a9ee7f853fa659bb0f86c0a01eeef9da2 100644 (file)
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -1401,8 +1401,7 @@ init_conntrack(struct net *net, struct nf_conn *tmpl,
                        /* exp->master safe, refcnt bumped in nf_ct_find_expectation */
                        ct->master = exp->master;
                        if (exp->helper) {
-                               help = nf_ct_helper_ext_add(ct, exp->helper,
-                                                           GFP_ATOMIC);
+                               help = nf_ct_helper_ext_add(ct, GFP_ATOMIC);
                                if (help)
                                        rcu_assign_pointer(help->helper, exp->helper);
                        }

diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
index a55a58c706a9fef94341e0c48eef0da6d00f7171..d557a425289d6e39263dd997836ec3166c73edb8 100644 (file)
--- a/net/netfilter/nf_conntrack_helper.c
+++ b/net/netfilter/nf_conntrack_helper.c
@@ -192,8 +192,7 @@ void nf_conntrack_helper_put(struct nf_conntrack_helper *helper)
 EXPORT_SYMBOL_GPL(nf_conntrack_helper_put);
 
 struct nf_conn_help *
-nf_ct_helper_ext_add(struct nf_conn *ct,
-                    struct nf_conntrack_helper *helper, gfp_t gfp)
+nf_ct_helper_ext_add(struct nf_conn *ct, gfp_t gfp)
 {
        struct nf_conn_help *help;
 
@@ -262,7 +261,7 @@ int __nf_ct_try_assign_helper(struct nf_conn *ct, struct nf_conn *tmpl,
        }
 
        if (help == NULL) {
-               help = nf_ct_helper_ext_add(ct, helper, flags);
+               help = nf_ct_helper_ext_add(ct, flags);
                if (help == NULL)
                        return -ENOMEM;
        } else {

diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 40152b9ad7722fcf138d82a2ed7034440e009595..f981bfa8db72ebc2e64a3add9457fa52a4e5d184 100644 (file)
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -1947,7 +1947,7 @@ ctnetlink_create_conntrack(struct net *net,
                } else {
                        struct nf_conn_help *help;
 
-                       help = nf_ct_helper_ext_add(ct, helper, GFP_ATOMIC);
+                       help = nf_ct_helper_ext_add(ct, GFP_ATOMIC);
                        if (help == NULL) {
                                err = -ENOMEM;
                                goto err2;

diff --git a/net/netfilter/nft_ct.c b/net/netfilter/nft_ct.c
index 1435ffc5f57ed4f652de56b1063208717c28bab6..3bc82ee5464d164d69c03f25e43f0833a5cae3f4 100644 (file)
--- a/net/netfilter/nft_ct.c
+++ b/net/netfilter/nft_ct.c
@@ -870,7 +870,7 @@ static void nft_ct_helper_obj_eval(struct nft_object *obj,
        if (test_bit(IPS_HELPER_BIT, &ct->status))
                return;
 
-       help = nf_ct_helper_ext_add(ct, to_assign, GFP_ATOMIC);
+       help = nf_ct_helper_ext_add(ct, GFP_ATOMIC);
        if (help) {
                rcu_assign_pointer(help->helper, to_assign);
                set_bit(IPS_HELPER_BIT, &ct->status);

diff --git a/net/netfilter/xt_CT.c b/net/netfilter/xt_CT.c
index 03b9a50ec93bd958d1ef46d59a981f8be1d89aa4..7ba454e9e3fa3a89492e9fad1d41bc21a95eb5c7 100644 (file)
--- a/net/netfilter/xt_CT.c
+++ b/net/netfilter/xt_CT.c
@@ -93,7 +93,7 @@ xt_ct_set_helper(struct nf_conn *ct, const char *helper_name,
                return -ENOENT;
        }
 
-       help = nf_ct_helper_ext_add(ct, helper, GFP_KERNEL);
+       help = nf_ct_helper_ext_add(ct, GFP_KERNEL);
        if (help == NULL) {
                nf_conntrack_helper_put(helper);
                return -ENOMEM;

diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
index e05bd3e53f0fc47c4c5a471960d5598460973d04..3e33c382367ff81860991caa2f8c05c51bfc26c0 100644 (file)
--- a/net/openvswitch/conntrack.c
+++ b/net/openvswitch/conntrack.c
@@ -1303,7 +1303,7 @@ static int ovs_ct_add_helper(struct ovs_conntrack_info *info, const char *name,
                return -EINVAL;
        }
 
-       help = nf_ct_helper_ext_add(info->ct, helper, GFP_KERNEL);
+       help = nf_ct_helper_ext_add(info->ct, GFP_KERNEL);
        if (!help) {
                nf_conntrack_helper_put(helper);
                return -ENOMEM;