From 9035c08635eaaf6d381fac54febf5816dcc4fae6 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Fri, 30 Nov 2018 22:25:54 +0100 Subject: 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 --- patches/0025-usb-sg/usbnet.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'patches/0025-usb-sg') 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); -- cgit v1.2.3