Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/nf-2.6
+4
-1
net/ipv4/netfilter/ip_nat_tftp.c
+4
-1
net/ipv4/netfilter/ip_nat_tftp.c
···
42
42
enum ip_conntrack_info ctinfo,
43
43
struct ip_conntrack_expect *exp)
44
44
{
45
-
exp->saved_proto.udp.port = exp->tuple.dst.u.tcp.port;
45
+
struct ip_conntrack *ct = exp->master;
46
+
47
+
exp->saved_proto.udp.port
48
+
= ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u.udp.port;
46
49
exp->dir = IP_CT_DIR_REPLY;
47
50
exp->expectfn = ip_nat_follow_master;
48
51
if (ip_conntrack_expect_related(exp) != 0)