- 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 70945b4..9200f6a 100644 (file)
--- 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);
        }