lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Linus Torvalds
2005-12-12 15:49:56 -08:00
parent 225bc8f1c7 2f9616d4c4
commit 14ee0a1414
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
net/ipv4/netfilter/ip_nat_tftp.c
View File

@@ -42,7 +42,10 @@ static unsigned int help(struct sk_buff **pskb,
enum ip_conntrack_info ctinfo, enum ip_conntrack_info ctinfo,
struct ip_conntrack_expect *exp) 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->dir = IP_CT_DIR_REPLY;
exp->expectfn = ip_nat_follow_master; exp->expectfn = ip_nat_follow_master;
if (ip_conntrack_expect_related(exp) != 0) if (ip_conntrack_expect_related(exp) != 0)