diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 15:49:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 15:49:56 -0800 |
| commit | 14ee0a1414536d27bc29373bf23c106b8ef8ce0b (patch) | |
| tree | 82a6233bc3cedb7f2b7bb0a8da8c112dba76f4b0 /net | |
| parent | 225bc8f1c7f534c01a4a8387b0d5fc9ee3830029 (diff) | |
| parent | 2f9616d4c44349c903bc1b54fe46ab0ce0210b74 (diff) | |
| download | op-kernel-dev-14ee0a1414536d27bc29373bf23c106b8ef8ce0b.zip op-kernel-dev-14ee0a1414536d27bc29373bf23c106b8ef8ce0b.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/nf-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/netfilter/ip_nat_tftp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ipv4/netfilter/ip_nat_tftp.c b/net/ipv4/netfilter/ip_nat_tftp.c index 2215317..43c3bd7 100644 --- a/net/ipv4/netfilter/ip_nat_tftp.c +++ b/net/ipv4/netfilter/ip_nat_tftp.c @@ -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) |
