diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2017-04-23 13:48:05 +0200 |
|---|---|---|
| committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2017-04-23 13:51:55 +0200 |
| commit | 2db05cd199999d9a3670e5287d067bdab0431f1a (patch) | |
| tree | ba5e4ebf8709115ccdab51b22ff120a695388055 /target/linux/generic/patches-4.9/023-5-lan78xx-use-skb_cow_head-to-deal-with-cloned-skbs.patch | |
| parent | 50fcfd4b654999a1cca71d593000e3775cf2d740 (diff) | |
| download | mtk-20170518-2db05cd199999d9a3670e5287d067bdab0431f1a.zip mtk-20170518-2db05cd199999d9a3670e5287d067bdab0431f1a.tar.gz mtk-20170518-2db05cd199999d9a3670e5287d067bdab0431f1a.tar.bz2 | |
kernel: use skb_cow_head() to deal with cloned skbs
We need to ensure there is enough headroom to push extra header,
but we also need to check if we are allowed to change headers.
skb_cow_head() is the proper helper to deal with this.
Fixes Ethernet<->WiFi bridge for Raspberry Pi and probably other devices.
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/generic/patches-4.9/023-5-lan78xx-use-skb_cow_head-to-deal-with-cloned-skbs.patch')
| -rw-r--r-- | target/linux/generic/patches-4.9/023-5-lan78xx-use-skb_cow_head-to-deal-with-cloned-skbs.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.9/023-5-lan78xx-use-skb_cow_head-to-deal-with-cloned-skbs.patch b/target/linux/generic/patches-4.9/023-5-lan78xx-use-skb_cow_head-to-deal-with-cloned-skbs.patch new file mode 100644 index 0000000..ea82799 --- /dev/null +++ b/target/linux/generic/patches-4.9/023-5-lan78xx-use-skb_cow_head-to-deal-with-cloned-skbs.patch @@ -0,0 +1,38 @@ +From d4ca73591916b760478d2b04334d5dcadc028e9c Mon Sep 17 00:00:00 2001 +From: Eric Dumazet <edumazet@google.com> +Date: Wed, 19 Apr 2017 09:59:24 -0700 +Subject: [PATCH] lan78xx: use skb_cow_head() to deal with cloned skbs + +We need to ensure there is enough headroom to push extra header, +but we also need to check if we are allowed to change headers. + +skb_cow_head() is the proper helper to deal with this. + +Fixes: 55d7de9de6c3 ("Microchip's LAN7800 family USB 2/3 to 10/100/1000 Ethernet device driver") +Signed-off-by: Eric Dumazet <edumazet@google.com> +Cc: James Hughes <james.hughes@raspberrypi.org> +Cc: Woojung Huh <woojung.huh@microchip.com> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + drivers/net/usb/lan78xx.c | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +--- a/drivers/net/usb/lan78xx.c ++++ b/drivers/net/usb/lan78xx.c +@@ -2419,14 +2419,9 @@ static struct sk_buff *lan78xx_tx_prep(s + { + u32 tx_cmd_a, tx_cmd_b; + +- if (skb_headroom(skb) < TX_OVERHEAD) { +- struct sk_buff *skb2; +- +- skb2 = skb_copy_expand(skb, TX_OVERHEAD, 0, flags); ++ if (skb_cow_head(skb, TX_OVERHEAD)) { + dev_kfree_skb_any(skb); +- skb = skb2; +- if (!skb) +- return NULL; ++ return NULL; + } + + if (lan78xx_linearize(skb) < 0) |