diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-05-11 19:06:26 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-05-11 19:06:55 +0300 |
| commit | bc88ba0cad64a4aa85f9deca79c6f3addcd21795 (patch) | |
| tree | 66db8412b3f65bf19645611afee4b1dbe14b74a8 /net/core/skbuff.c | |
| parent | 285b2a46953cecea207c53f7c6a7a76c9bbab303 (diff) | |
| parent | 6e27831b91a0bc572902eb065b374991c1ef452a (diff) | |
| download | linux-bc88ba0cad64a4aa85f9deca79c6f3addcd21795.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes. No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/core/skbuff.c')
| -rw-r--r-- | net/core/skbuff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index a82b33b1555e..01b48e68aca0 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -5281,7 +5281,7 @@ bool skb_partial_csum_set(struct sk_buff *skb, u16 start, u16 off) u32 csum_end = (u32)start + (u32)off + sizeof(__sum16); u32 csum_start = skb_headroom(skb) + (u32)start; - if (unlikely(csum_start > U16_MAX || csum_end > skb_headlen(skb))) { + if (unlikely(csum_start >= U16_MAX || csum_end > skb_headlen(skb))) { net_warn_ratelimited("bad partial csum: csum=%u/%u headroom=%u headlen=%u\n", start, off, skb_headroom(skb), skb_headlen(skb)); return false; @@ -5289,7 +5289,7 @@ bool skb_partial_csum_set(struct sk_buff *skb, u16 start, u16 off) skb->ip_summed = CHECKSUM_PARTIAL; skb->csum_start = csum_start; skb->csum_offset = off; - skb_set_transport_header(skb, start); + skb->transport_header = csum_start; return true; } EXPORT_SYMBOL_GPL(skb_partial_csum_set); |