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

Commit 14ee0a14 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/nf-2.6

parents 225bc8f1 2f9616d4

net/ipv4/netfilter/ip_nat_tftp.c

+4 −1
Original line number Diff line number Diff line
@@ -42,7 +42,10 @@ static unsigned int help(struct sk_buff **pskb, 
			 enum ip_conntrack_info ctinfo,

			 struct ip_conntrack_expect *exp)

{

	exp->saved_proto.udp.port = exp->tuple.dst.u.tcp.port;

	struct ip_conntrack *ct = exp->master;



	exp->saved_proto.udp.port

		= ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u.udp.port;

	exp->dir = IP_CT_DIR_REPLY;

	exp->expectfn = ip_nat_follow_master;

	if (ip_conntrack_expect_related(exp) != 0)