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

Commit 04a4eba4 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Netfilter: Fixes for NATTYPE module compilation"

parents bc4539d5 9aad3201

net/ipv4/netfilter/ipt_NATTYPE.c

+8 −7
Original line number Diff line number Diff line
@@ -98,7 +98,8 @@ static void nattype_free(struct ipt_nattype *nte) 
/* netfilter NATTYPE nattype_refresh_timer()

 * Refresh the timer for this object.

 */

bool nattype_refresh_timer(unsigned long nat_type, unsigned long timeout_value)

bool nattype_refresh_timer_impl(unsigned long nat_type,

				unsigned long timeout_value)

{

	struct ipt_nattype *nte = (struct ipt_nattype *)nat_type;
@@ -289,7 +290,7 @@ static unsigned int nattype_nat(struct sk_buff *skb, 
{

	struct ipt_nattype *nte;



	if (par->hooknum != NF_INET_PRE_ROUTING)

	if (xt_hooknum(par) != NF_INET_PRE_ROUTING)

		return XT_CONTINUE;

	spin_lock_bh(&nattype_lock);

	list_for_each_entry(nte, &nattype_list, list) {
@@ -356,7 +357,7 @@ static unsigned int nattype_forward(struct sk_buff *skb, 
	u16 nat_port;

	enum ip_conntrack_dir dir;



	if (par->hooknum != NF_INET_POST_ROUTING)

	if (xt_hooknum(par) != NF_INET_POST_ROUTING)

		return XT_CONTINUE;



	/* netfilter
@@ -387,7 +388,7 @@ static unsigned int nattype_forward(struct sk_buff *skb, 
			 * found the entry.

			 */

			if (!nattype_refresh_timer((unsigned long)nte,

						   ct->timeout.expires))

						   ct->timeout))

				break;



			/* netfilter NATTYPE
@@ -485,8 +486,8 @@ static unsigned int nattype_forward(struct sk_buff *skb, 
	/* netfilter NATTYPE

	 * Add the new entry to the list.

	 */

	nte->timeout_value = ct->timeout.expires;

	nte->timeout.expires = ct->timeout.expires + jiffies;

	nte->timeout_value = ct->timeout;

	nte->timeout.expires = ct->timeout + jiffies;

	add_timer(&nte->timeout);

	list_add(&nte->list, &nattype_list);

	ct->nattype_entry = (unsigned long)nte;
@@ -538,7 +539,7 @@ static unsigned int nattype_target(struct sk_buff *skb, 
		return XT_CONTINUE;



	DEBUGP("%s: type = %s, mode = %s\n",

	       __func_, types[info->type], modes[info->mode]);

	       __func__, types[info->type], modes[info->mode]);



	/* netfilter NATTYPE

	 * TODO: why have mode at all since par->hooknum provides

net/netfilter/nf_conntrack_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1564,7 +1564,7 @@ void __nf_ct_refresh_acct(struct nf_conn *ct, 
#if defined(CONFIG_IP_NF_TARGET_NATTYPE_MODULE)

	nattype_ref_timer = rcu_dereference(nattype_refresh_timer);

	if (nattype_ref_timer)

		nattype_ref_timer(ct->nattype_entry, ct->timeout.expires);

		nattype_ref_timer(ct->nattype_entry, ct->timeout);

#endif



acct:

net/netfilter/nf_conntrack_netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -1588,7 +1588,7 @@ static int ctnetlink_change_timeout(struct nf_conn *ct, 
#if defined(CONFIG_IP_NF_TARGET_NATTYPE_MODULE)

	nattype_ref_timer = rcu_dereference(nattype_refresh_timer);

	if (nattype_ref_timer)

		nattype_ref_timer(ct->nattype_entry, ct->timeout.expires);

		nattype_ref_timer(ct->nattype_entry, ct->timeout);

#endif

	return 0;

}