From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Mon, 17 Jan 2005 20:02:29 +0000 (+0000)
Subject: - PL3791 fix: Suppress RST if the port was bound to a (presumably raw) socket
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~291
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c8d96a49a2ae2ec6e8a637582e0ec6b2058f38b4;p=linux-2.6.git

- PL3791 fix: Suppress RST if the port was bound to a (presumably raw) socket
---

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 70945b48a..55b80609a 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1856,7 +1856,8 @@ no_tcp_socket:
 	if (skb->len < (th->doff << 2) || tcp_checksum_complete(skb)) {
 bad_packet:
 		TCP_INC_STATS_BH(TCP_MIB_INERRS);
-	} else {
+	} else if (!skb->sk) {
+		/* VNET: Suppress RST if the port was bound to a (presumably raw) socket */
 		tcp_v4_send_reset(skb);
 	}