Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits)
  [IPV4] SNMP: Support OutMcastPkts and OutBcastPkts
  [IPV4] SNMP: Support InMcastPkts and InBcastPkts
  [IPV4] SNMP: Support InTruncatedPkts
  [IPV4] SNMP: Support InNoRoutes
  [SNMP]: Add definitions for {In,Out}BcastPkts
  [TCP] FRTO: RFC4138 allows Nagle override when new data must be sent
  [TCP] FRTO: Delay skb available check until it's mandatory
  [XFRM]: Restrict upper layer information by bundle.
  [TCP]: Catch skb with S+L bugs earlier
  [PATCH] INET : IPV4 UDP lookups converted to a 2 pass algo
  [L2TP]: Add the ability to autoload a pppox protocol module.
  [SKB]: Introduce skb_queue_walk_safe()
  [AF_IUCV/IUCV]: smp_call_function deadlock
  [IPV6]: Fix slab corruption running ip6sic
  [TCP]: Update references in two old comments
  [XFRM]: Export SPD info
  [IPV6]: Track device renames in snmp6.
  [SCTP]: Fix sctp_getsockopt_local_addrs_old() to use local storage.
  [NET]: Remove NETIF_F_INTERNAL_STATS, default to internal stats.
  [NETPOLL]: Remove CONFIG_NETPOLL_RX
  ...

1 files changed, 6 insertions, 8 deletions

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 2cf9a898ce50..d6e488668171 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1573,14 +1573,12 @@ void tcp_close(struct sock *sk, long timeout)
 
         sk_stream_mem_reclaim(sk);
 
-        /* As outlined in draft-ietf-tcpimpl-prob-03.txt, section
-         * 3.10, we send a RST here because data was lost.  To
-         * witness the awful effects of the old behavior of always
-         * doing a FIN, run an older 2.1.x kernel or 2.0.x, start
-         * a bulk GET in an FTP client, suspend the process, wait
-         * for the client to advertise a zero window, then kill -9
-         * the FTP client, wheee...  Note: timeout is always zero
-         * in such a case.
+        /* As outlined in RFC 2525, section 2.17, we send a RST here because
+         * data was lost. To witness the awful effects of the old behavior of
+         * always doing a FIN, run an older 2.1.x kernel or 2.0.x, start a bulk
+         * GET in an FTP client, suspend the process, wait for the client to
+         * advertise a zero window, then kill -9 the FTP client, wheee...
+         * Note: timeout is always zero in such a case.
          */
         if (data_was_unread) {
                 /* Unread data was tossed, zap the connection. */