From d4f641855d0fbb90457e3eabdc41591e1781391f Mon Sep 17 00:00:00 2001
From: Vijay Subramanian <subramanian.vijay@gmail.com>
Date: Sat, 23 Jun 2012 17:38:10 +0000
Subject: [PATCH] --- yaml --- r: 314575 b: refs/heads/master c:
 7011d0851b80a1a229acfda37ce08aad903b12d1 h: refs/heads/master i:   314573:
 2c75e8a78be352f1fcdcb2d4cf13473066bc0b67   314571:
 b6036d2addb5d5530c5aedb2d880282556e491a6   314567:
 6b30ce4864d4f96ec521acdd7d59ef1242cac678   314559:
 61a757401c2a91c6b4792cc0e9e05cf8c5ddbff4 v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv4/tcp_ipv4.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 88a7bdf4427d..16dfef62e749 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b4a9e1a591ca92726d32dbe043eb737734c6a0e
+refs/heads/master: 7011d0851b80a1a229acfda37ce08aad903b12d1
diff --git a/trunk/net/ipv4/tcp_ipv4.c b/trunk/net/ipv4/tcp_ipv4.c
index b52934f5334e..1781dc650b9d 100644
--- a/trunk/net/ipv4/tcp_ipv4.c
+++ b/trunk/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;