|
@@ -318,7 +318,7 @@ Signe-off-by: Felix Fietkau <[email protected]>
|
|
|
flush = NAPI_GRO_CB(p)->flush;
|
|
|
flush |= (__force int)(flags & TCP_FLAG_CWR);
|
|
|
flush |= (__force int)((flags ^ tcp_flag_word(th2)) &
|
|
|
-@@ -268,6 +350,18 @@ found:
|
|
|
+@@ -268,6 +350,19 @@ found:
|
|
|
flush |= p->decrypted ^ skb->decrypted;
|
|
|
#endif
|
|
|
|
|
@@ -326,6 +326,7 @@ Signe-off-by: Felix Fietkau <[email protected]>
|
|
|
+ flush |= (__force int)(flags ^ tcp_flag_word(th2));
|
|
|
+ flush |= skb->ip_summed != p->ip_summed;
|
|
|
+ flush |= skb->csum_level != p->csum_level;
|
|
|
++ flush |= !pskb_may_pull(skb, skb_gro_offset(skb));
|
|
|
+ flush |= NAPI_GRO_CB(p)->count >= 64;
|
|
|
+
|
|
|
+ if (flush || skb_gro_receive_list(p, skb))
|
|
@@ -337,7 +338,7 @@ Signe-off-by: Felix Fietkau <[email protected]>
|
|
|
if (flush || skb_gro_receive(p, skb)) {
|
|
|
mss = 1;
|
|
|
goto out_check_final;
|
|
|
-@@ -289,7 +383,6 @@ out_check_final:
|
|
|
+@@ -289,7 +384,6 @@ out_check_final:
|
|
|
if (p && (!NAPI_GRO_CB(skb)->same_flow || flush))
|
|
|
pp = p;
|
|
|
|
|
@@ -345,7 +346,7 @@ Signe-off-by: Felix Fietkau <[email protected]>
|
|
|
NAPI_GRO_CB(skb)->flush |= (flush != 0);
|
|
|
|
|
|
return pp;
|
|
|
-@@ -315,18 +408,58 @@ int tcp_gro_complete(struct sk_buff *skb
|
|
|
+@@ -315,18 +409,58 @@ int tcp_gro_complete(struct sk_buff *skb
|
|
|
}
|
|
|
EXPORT_SYMBOL(tcp_gro_complete);
|
|
|
|
|
@@ -409,7 +410,7 @@ Signe-off-by: Felix Fietkau <[email protected]>
|
|
|
}
|
|
|
|
|
|
INDIRECT_CALLABLE_SCOPE int tcp4_gro_complete(struct sk_buff *skb, int thoff)
|
|
|
-@@ -334,6 +467,15 @@ INDIRECT_CALLABLE_SCOPE int tcp4_gro_com
|
|
|
+@@ -334,6 +468,15 @@ INDIRECT_CALLABLE_SCOPE int tcp4_gro_com
|
|
|
const struct iphdr *iph = ip_hdr(skb);
|
|
|
struct tcphdr *th = tcp_hdr(skb);
|
|
|
|