Merge tag 'stable/for-linus-3.14-rc0-late-tag' of git://git.kernel.org/pub/scm/linux...

[mirror_ubuntu-artful-kernel.git] / include / linux / tcp.h

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index d68633452d9b070ce12056e5a17dc40f1f148c4d..4ad0706d40ebecf98e1ca95483a79f9dd44e903c 100644 (file)
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -248,7 +248,10 @@ struct tcp_sock {
        struct sk_buff* lost_skb_hint;
        struct sk_buff *retransmit_skb_hint;
 
-       struct sk_buff_head     out_of_order_queue; /* Out of order segments go here */
+       /* OOO segments go in this list. Note that socket lock must be held,
+        * as we do not use sk_buff_head lock.
+        */
+       struct sk_buff_head     out_of_order_queue;
 
        /* SACKs data, these 2 need to be together (see tcp_options_write) */
        struct tcp_sack_block duplicate_sack[1]; /* D-SACK block */