Pull pnpacpi into acpica branch

[linux-2.6] / net / ipv4 / netfilter / ip_nat_tftp.c

diff --git a/net/ipv4/netfilter/ip_nat_tftp.c b/net/ipv4/netfilter/ip_nat_tftp.c
index 0343e0d64674d46a1b97d017036b65f5dded1772..43c3bd7c118e70b1594f11e6397444090ecee1a1 100644 (file)
--- a/net/ipv4/netfilter/ip_nat_tftp.c
+++ b/net/ipv4/netfilter/ip_nat_tftp.c
@@ -42,13 +42,14 @@ 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) {
-               ip_conntrack_expect_free(exp);
+       if (ip_conntrack_expect_related(exp) != 0)
                return NF_DROP;
-       }
        return NF_ACCEPT;
 }