summaryrefslogtreecommitdiffstats
path: root/include/linux/tcp.h
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2014-01-06 09:36:12 -0800
committerDavid S. Miller <davem@davemloft.net>2014-01-06 16:34:34 -0500
commit996b175e39ed42ec2aa0c63b4a03cc500aa6269f (patch)
treeef8eb180ad164a68c56189632619e79b2bb7b62f /include/linux/tcp.h
parent0b23810d8c37a707abb076394c4bca76362cf06d (diff)
downloadop-kernel-dev-996b175e39ed42ec2aa0c63b4a03cc500aa6269f.zip
op-kernel-dev-996b175e39ed42ec2aa0c63b4a03cc500aa6269f.tar.gz
tcp: out_of_order_queue do not use its lock
TCP out_of_order_queue lock is not used, as queue manipulation happens with socket lock held and we therefore use the lockless skb queue routines (as __skb_queue_head()) We can use __skb_queue_head_init() instead of skb_queue_head_init() to make this more consistent. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/tcp.h')
-rw-r--r--include/linux/tcp.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index d686334..4ad0706 100644
--- 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 */
OpenPOWER on IntegriCloud