Skip to content

L
linux-davinci
Commit 14ee0a14 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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

parents 225bc8f1 2f9616d4
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
net/ipv4/netfilter/ip_nat_tftp.c
View file @ 14ee0a14
...@@ -42,7 +42,10 @@ static unsigned int help(struct sk_buff **pskb, ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment