diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-11-30 22:25:54 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-12-06 22:54:26 +0100 |
| commit | 9035c08635eaaf6d381fac54febf5816dcc4fae6 (patch) | |
| tree | 9da04f20e16fb1c0f0cbf5198a4fff41e4d65af8 /patches/0025-usb-sg | |
| parent | b198137b5b0011ed7ea8b58f2b6a3e391ceec662 (diff) | |
backports: Refresh patches on kernel 4.20-rc4
This patch was merged upstream and removed from backports:
* patches/0090-use-skb_pad.patch
This patch was manually modified:
* patches/0025-usb-sg/usbnet.patch
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/0025-usb-sg')
| -rw-r--r-- | patches/0025-usb-sg/usbnet.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/0025-usb-sg/usbnet.patch b/patches/0025-usb-sg/usbnet.patch index 50c2d274..cab07250 100644 --- a/patches/0025-usb-sg/usbnet.patch +++ b/patches/0025-usb-sg/usbnet.patch @@ -58,10 +58,10 @@ +#if LINUX_VERSION_IS_GEQ(3,35,0) kfree(entry->urb->sg); +#endif + /* fall through */ case rx_cleanup: usb_free_urb (entry->urb); - dev_kfree_skb (skb); -@@ -1893,7 +1911,9 @@ int usbnet_resume (struct usb_interface +@@ -1894,7 +1912,9 @@ int usbnet_resume (struct usb_interface retval = usb_submit_urb(res, GFP_ATOMIC); if (retval < 0) { dev_kfree_skb_any(skb); |