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

Three trivial overlapping conflicts.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 12 insertions, 1 deletions

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index faa6fa619f59..af81e4a6a8d8 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1673,7 +1673,9 @@ bool tcp_add_backlog(struct sock *sk, struct sk_buff *skb)
         if (TCP_SKB_CB(tail)->end_seq != TCP_SKB_CB(skb)->seq ||
             TCP_SKB_CB(tail)->ip_dsfield != TCP_SKB_CB(skb)->ip_dsfield ||
             ((TCP_SKB_CB(tail)->tcp_flags |
-              TCP_SKB_CB(skb)->tcp_flags) & TCPHDR_URG) ||
+              TCP_SKB_CB(skb)->tcp_flags) & (TCPHDR_SYN | TCPHDR_RST | TCPHDR_URG)) ||
+            !((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)) ||
 #ifdef CONFIG_TLS_DEVICE
@@ -1692,6 +1694,15 @@ bool tcp_add_backlog(struct sock *sk, struct sk_buff *skb)
                 if (after(TCP_SKB_CB(skb)->ack_seq, TCP_SKB_CB(tail)->ack_seq))
                         TCP_SKB_CB(tail)->ack_seq = TCP_SKB_CB(skb)->ack_seq;
 
+                /* We have to update both TCP_SKB_CB(tail)->tcp_flags and
+                 * thtail->fin, so that the fast path in tcp_rcv_established()
+                 * is not entered if we append a packet with a FIN.
+                 * SYN, RST, URG are not present.
+                 * ACK is set on both packets.
+                 * PSH : we do not really care in TCP stack,
+                 *       at least for 'GRO' packets.
+                 */
+                thtail->fin |= th->fin;
                 TCP_SKB_CB(tail)->tcp_flags |= TCP_SKB_CB(skb)->tcp_flags;
 
                 if (TCP_SKB_CB(skb)->has_rxtstamp) {