From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Thu, 27 Jan 2005 20:46:12 +0000 (+0000)
Subject: - merge revision 1.14
X-Git-Tag: planetlab-3_0-rc10~22
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7cccf890afcab2f6a46a1cf1119979eba67df1b4;p=linux-2.6.git

- merge revision 1.14
date: 2005/01/17 20:02:29;  author: mlhuang;  state: Exp;  lines: +2 -1
- 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..9200f6a0b 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -5,7 +5,7 @@
  *
  *		Implementation of the Transmission Control Protocol(TCP).
  *
- * Version:	$Id: tcp_ipv4.c,v 1.240 2002/02/01 22:01:04 davem Exp $
+ * Version:	$Id$
  *
  *		IPv4 specific functions
  *
@@ -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);
 	}