diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2023-01-19 03:52:33 +0300 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2023-01-19 03:52:33 +0300 |
| commit | 077010cef0aec280ac6eccc217395cbe8543d5a8 (patch) | |
| tree | 50d9f5071b4d33532ffed0ed71152ea8fc7091f9 /net/core/gro.c | |
| parent | 18e6340365eab44339a0aadab76c3d26a2406a72 (diff) | |
| parent | 5dc4c995db9eb45f6373a956eb1f69460e69e6d4 (diff) | |
| download | linux-077010cef0aec280ac6eccc217395cbe8543d5a8.tar.xz | |
Sync with v6.2-rc4
Merge branch 'master' into mm-nonmm-stable
Diffstat (limited to 'net/core/gro.c')
| -rw-r--r-- | net/core/gro.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/core/gro.c b/net/core/gro.c index fd8c6a7e8d3e..506f83d715f8 100644 --- a/net/core/gro.c +++ b/net/core/gro.c @@ -505,8 +505,9 @@ found_ptype: NAPI_GRO_CB(skb)->count = 1; if (unlikely(skb_is_gso(skb))) { NAPI_GRO_CB(skb)->count = skb_shinfo(skb)->gso_segs; - /* Only support TCP at the moment. */ - if (!skb_is_gso_tcp(skb)) + /* Only support TCP and non DODGY users. */ + if (!skb_is_gso_tcp(skb) || + (skb_shinfo(skb)->gso_type & SKB_GSO_DODGY)) NAPI_GRO_CB(skb)->flush = 1; } |