diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-04-23 14:29:17 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-04-23 14:33:26 +0300 |
commit | 0d31ea587709216d88183fe4ca0c8aba5e0205b8 (patch) | |
tree | d53e955f7bf1511b3a5f70448285b32f0ffbaa0d /net/core/gro.c | |
parent | 684e9f5f97eb4b7831298ffad140d5c1d426ff27 (diff) | |
parent | ed30a4a51bb196781c8058073ea720133a65596f (diff) | |
download | linux-0d31ea587709216d88183fe4ca0c8aba5e0205b8.tar.xz |
Merge 6.9-rc5 into usb-next
We need the usb/thunderbolt fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/core/gro.c')
-rw-r--r-- | net/core/gro.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/gro.c b/net/core/gro.c index ee30d4f0c038..83f35d99a682 100644 --- a/net/core/gro.c +++ b/net/core/gro.c @@ -192,8 +192,9 @@ int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb) } merge: - /* sk owenrship - if any - completely transferred to the aggregated packet */ + /* sk ownership - if any - completely transferred to the aggregated packet */ skb->destructor = NULL; + skb->sk = NULL; delta_truesize = skb->truesize; if (offset > headlen) { unsigned int eat = offset - headlen; |