Commit d722762c authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by David S. Miller
Browse files

tcp: AccECN support to tcp_add_backlog 



AE flag needs to be preserved for AccECN.

Signed-off-by: default avatarIlpo Järvinen <ij@kernel.org>
Signed-off-by: default avatarChia-Yu Chang <chia-yu.chang@nokia-bell-labs.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4e4f7cef

net/ipv4/tcp_ipv4.c

+2 −1
Original line number Diff line number Diff line
@@ -2051,7 +2051,8 @@ bool tcp_add_backlog(struct sock *sk, struct sk_buff *skb, 
	    !((TCP_SKB_CB(tail)->tcp_flags &

	      TCP_SKB_CB(skb)->tcp_flags) & TCPHDR_ACK) ||

	    ((TCP_SKB_CB(tail)->tcp_flags ^

	      TCP_SKB_CB(skb)->tcp_flags) & (TCPHDR_ECE | TCPHDR_CWR)) ||

	      TCP_SKB_CB(skb)->tcp_flags) &

	     (TCPHDR_ECE | TCPHDR_CWR | TCPHDR_AE)) ||

	    !tcp_skb_can_collapse_rx(tail, skb) ||

	    thtail->doff != th->doff ||

	    memcmp(thtail + 1, th + 1, hdrlen - sizeof(*th)))