summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Subramanian2012-06-23 19:38:10 +0200
committerDavid S. Miller2012-06-24 08:22:38 +0200
commit7011d0851b80a1a229acfda37ce08aad903b12d1 (patch)
tree21d5572e6c6a0bc973fcc11c00e01e0de0491c86
parentMerge branch 'master' of git://1984.lsi.us.es/nf-next (diff)
downloadkernel-qcow2-linux-7011d0851b80a1a229acfda37ce08aad903b12d1.tar.gz
kernel-qcow2-linux-7011d0851b80a1a229acfda37ce08aad903b12d1.tar.xz
kernel-qcow2-linux-7011d0851b80a1a229acfda37ce08aad903b12d1.zip
tcp: Fix bug in tcp socket early demux
The dest port for the call to __inet_lookup_established() in TCP early demux code is passed with the wrong endian-ness. This causes the lookup to fail leading to early demux not being used. Signed-off-by: Vijay Subramanian <subramanian.vijay@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv4/tcp_ipv4.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index b52934f5334e..1781dc650b9d 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1701,7 +1701,7 @@ int tcp_v4_early_demux(struct sk_buff *skb)
dev = skb->dev;
sk = __inet_lookup_established(net, &tcp_hashinfo,
iph->saddr, th->source,
- iph->daddr, th->dest,
+ iph->daddr, ntohs(th->dest),
dev->ifindex);
if (sk) {
skb->sk = sk;