Skip to content

Commit 440534d

Browse files
gfreewindummakynes
authored andcommitted
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>
1 parent 762c400 commit 440534d

File tree

7 files changed

+8
-12
lines changed

7 files changed

+8
-12
lines changed

include/net/netfilter/nf_conntrack_helper.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,7 @@ int nf_conntrack_helpers_register(struct nf_conntrack_helper *, unsigned int);
103103
void nf_conntrack_helpers_unregister(struct nf_conntrack_helper *,
104104
unsigned int);
105105

106-
struct nf_conn_help *nf_ct_helper_ext_add(struct nf_conn *ct,
107-
struct nf_conntrack_helper *helper,
108-
gfp_t gfp);
106+
struct nf_conn_help *nf_ct_helper_ext_add(struct nf_conn *ct, gfp_t gfp);
109107

110108
int __nf_ct_try_assign_helper(struct nf_conn *ct, struct nf_conn *tmpl,
111109
gfp_t flags);

net/netfilter/nf_conntrack_core.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1401,8 +1401,7 @@ init_conntrack(struct net *net, struct nf_conn *tmpl,
14011401
/* exp->master safe, refcnt bumped in nf_ct_find_expectation */
14021402
ct->master = exp->master;
14031403
if (exp->helper) {
1404-
help = nf_ct_helper_ext_add(ct, exp->helper,
1405-
GFP_ATOMIC);
1404+
help = nf_ct_helper_ext_add(ct, GFP_ATOMIC);
14061405
if (help)
14071406
rcu_assign_pointer(help->helper, exp->helper);
14081407
}

net/netfilter/nf_conntrack_helper.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,7 @@ void nf_conntrack_helper_put(struct nf_conntrack_helper *helper)
192192
EXPORT_SYMBOL_GPL(nf_conntrack_helper_put);
193193

194194
struct nf_conn_help *
195-
nf_ct_helper_ext_add(struct nf_conn *ct,
196-
struct nf_conntrack_helper *helper, gfp_t gfp)
195+
nf_ct_helper_ext_add(struct nf_conn *ct, gfp_t gfp)
197196
{
198197
struct nf_conn_help *help;
199198

@@ -262,7 +261,7 @@ int __nf_ct_try_assign_helper(struct nf_conn *ct, struct nf_conn *tmpl,
262261
}
263262

264263
if (help == NULL) {
265-
help = nf_ct_helper_ext_add(ct, helper, flags);
264+
help = nf_ct_helper_ext_add(ct, flags);
266265
if (help == NULL)
267266
return -ENOMEM;
268267
} else {

net/netfilter/nf_conntrack_netlink.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1947,7 +1947,7 @@ ctnetlink_create_conntrack(struct net *net,
19471947
} else {
19481948
struct nf_conn_help *help;
19491949

1950-
help = nf_ct_helper_ext_add(ct, helper, GFP_ATOMIC);
1950+
help = nf_ct_helper_ext_add(ct, GFP_ATOMIC);
19511951
if (help == NULL) {
19521952
err = -ENOMEM;
19531953
goto err2;

net/netfilter/nft_ct.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,7 @@ static void nft_ct_helper_obj_eval(struct nft_object *obj,
870870
if (test_bit(IPS_HELPER_BIT, &ct->status))
871871
return;
872872

873-
help = nf_ct_helper_ext_add(ct, to_assign, GFP_ATOMIC);
873+
help = nf_ct_helper_ext_add(ct, GFP_ATOMIC);
874874
if (help) {
875875
rcu_assign_pointer(help->helper, to_assign);
876876
set_bit(IPS_HELPER_BIT, &ct->status);

net/netfilter/xt_CT.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ xt_ct_set_helper(struct nf_conn *ct, const char *helper_name,
9393
return -ENOENT;
9494
}
9595

96-
help = nf_ct_helper_ext_add(ct, helper, GFP_KERNEL);
96+
help = nf_ct_helper_ext_add(ct, GFP_KERNEL);
9797
if (help == NULL) {
9898
nf_conntrack_helper_put(helper);
9999
return -ENOMEM;

net/openvswitch/conntrack.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1303,7 +1303,7 @@ static int ovs_ct_add_helper(struct ovs_conntrack_info *info, const char *name,
13031303
return -EINVAL;
13041304
}
13051305

1306-
help = nf_ct_helper_ext_add(info->ct, helper, GFP_KERNEL);
1306+
help = nf_ct_helper_ext_add(info->ct, GFP_KERNEL);
13071307
if (!help) {
13081308
nf_conntrack_helper_put(helper);
13091309
return -ENOMEM;

0 commit comments

Comments
 (0)