diff options
author | Jakub Kicinski <kuba@kernel.org> | 2022-10-27 15:37:56 -0700 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2022-10-27 16:56:36 -0700 |
commit | 31f1aa4f740fc591450777f4ff94d6e062b6f632 (patch) | |
tree | b6bfe700d8338b3c88f4d8413b624d0d5fd78e4a /net/core/skbuff.c | |
parent | 12d6c1d3a2ad0c199ec57c201cdc71e8e157a232 (diff) | |
parent | 23758867219c8d84c8363316e6dd2f9fd7ae3049 (diff) | |
download | linux-31f1aa4f740fc591450777f4ff94d6e062b6f632.tar.gz linux-31f1aa4f740fc591450777f4ff94d6e062b6f632.tar.bz2 linux-31f1aa4f740fc591450777f4ff94d6e062b6f632.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
2871edb32f46 ("can: kvaser_usb: Fix possible completions during init_completion")
abb8670938b2 ("can: kvaser_usb_leaf: Ignore stale bus-off after start")
8d21f5927ae6 ("can: kvaser_usb_leaf: Fix improved state not being reported")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/core/skbuff.c')
-rw-r--r-- | net/core/skbuff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 7c41025ae76a..1d84a17eada5 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -3980,7 +3980,7 @@ int skb_append_pagefrags(struct sk_buff *skb, struct page *page, } else if (i < MAX_SKB_FRAGS) { skb_zcopy_downgrade_managed(skb); get_page(page); - skb_fill_page_desc(skb, i, page, offset, size); + skb_fill_page_desc_noacc(skb, i, page, offset, size); } else { return -EMSGSIZE; } |