Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 440534d3 authored by Gao Feng's avatar Gao Feng Committed by Pablo Neira Ayuso
Browse files

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: default avatarGao Feng <gfree.wind@vip.163.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 762c4007

include/net/netfilter/nf_conntrack_helper.h

+1 −3
Original line number Diff line number Diff line
@@ -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);

net/netfilter/nf_conntrack_core.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

			}

net/netfilter/nf_conntrack_helper.c

+2 −3
Original line number Diff line number Diff line
@@ -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 {

net/netfilter/nf_conntrack_netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

net/netfilter/nft_ct.c

+1 −1
Original line number Diff line number Diff line
@@ -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);