diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-05-08 20:21:51 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-05-08 20:21:51 +0200 |
| commit | ed63ba15d7830c30077dbb33c94242be01e45a18 (patch) | |
| tree | 8165313975d57f025e640d33768dbc31493ce5b7 /net/ipv4/af_inet.c | |
| parent | scripts/spdxcheck: Add count of missing files to stats output (diff) | |
| parent | Linux 6.9-rc7 (diff) | |
| download | linux-ed63ba15d7830c30077dbb33c94242be01e45a18.tar.xz linux-ed63ba15d7830c30077dbb33c94242be01e45a18.zip | |
Merge 6.9-rc7 into char-misc-testing
We need the char-misc changes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv4/af_inet.c')
| -rw-r--r-- | net/ipv4/af_inet.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 55bd72997b31..fafb123f798b 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -1572,6 +1572,7 @@ struct sk_buff *inet_gro_receive(struct list_head *head, struct sk_buff *skb) /* The above will be needed by the transport layer if there is one * immediately following this IP hdr. */ + NAPI_GRO_CB(skb)->inner_network_offset = off; /* Note : No need to call skb_gro_postpull_rcsum() here, * as we already checked checksum over ipv4 header was 0 |