diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2017-09-17 18:58:10 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2017-09-21 15:16:55 +0200 |
commit | 0acb6552992e7fb62b24a5ed48f46250fdff0494 (patch) | |
tree | 15719bb5e469848c50cae42aaa533c355ba04dbe /patches/0025-usb-sg/usbnet.patch | |
parent | 75ed12f298e69fcf618aeeefe89e507f8cfac87a (diff) |
patches: refresh patches on v4.14-rc1
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/0025-usb-sg/usbnet.patch')
-rw-r--r-- | patches/0025-usb-sg/usbnet.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/patches/0025-usb-sg/usbnet.patch b/patches/0025-usb-sg/usbnet.patch index 1a1017c3..5b6fc25d 100644 --- a/patches/0025-usb-sg/usbnet.patch +++ b/patches/0025-usb-sg/usbnet.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c -@@ -1270,6 +1270,7 @@ EXPORT_SYMBOL_GPL(usbnet_tx_timeout); +@@ -1310,6 +1310,7 @@ EXPORT_SYMBOL_GPL(usbnet_tx_timeout); /*-------------------------------------------------------------------------*/ @@ -8,7 +8,7 @@ static int build_dma_sg(const struct sk_buff *skb, struct urb *urb) { unsigned num_sgs, total_len = 0; -@@ -1302,6 +1303,12 @@ static int build_dma_sg(const struct sk_ +@@ -1342,6 +1343,12 @@ static int build_dma_sg(const struct sk_ return 1; } @@ -21,7 +21,7 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb, struct net_device *net) -@@ -1358,12 +1365,19 @@ netdev_tx_t usbnet_start_xmit (struct sk +@@ -1398,12 +1405,19 @@ netdev_tx_t usbnet_start_xmit (struct sk if (!(info->flags & FLAG_SEND_ZLP)) { if (!(info->flags & FLAG_MULTI_PACKET)) { length++; @@ -41,7 +41,7 @@ } } else urb->transfer_flags |= URB_ZERO_PACKET; -@@ -1430,7 +1444,9 @@ not_drop: +@@ -1470,7 +1484,9 @@ not_drop: if (skb) dev_kfree_skb_any (skb); if (urb) { @@ -51,7 +51,7 @@ usb_free_urb(urb); } } else -@@ -1483,7 +1499,9 @@ static void usbnet_bh (unsigned long par +@@ -1523,7 +1539,9 @@ static void usbnet_bh (unsigned long par rx_process (dev, skb); continue; case tx_done: @@ -61,7 +61,7 @@ case rx_cleanup: usb_free_urb (entry->urb); dev_kfree_skb (skb); -@@ -1840,7 +1858,9 @@ int usbnet_resume (struct usb_interface +@@ -1892,7 +1910,9 @@ int usbnet_resume (struct usb_interface retval = usb_submit_urb(res, GFP_ATOMIC); if (retval < 0) { dev_kfree_skb_any(skb); |