diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2019-05-24 22:24:34 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-06-30 17:41:45 +0200 |
| commit | 25fa8919b124f8d7585327988b2a0a4a325e87d6 (patch) | |
| tree | fad5ab3a0744958fa1cb3381f139981c90d766f1 /patches/0025-usb-sg/usbnet.patch | |
| parent | 1cc5efe8e280d78b5552bfee88bdac257151d888 (diff) | |
patches: Make patches apply on top of kernel 5.2-rc6
The cordic.c file was moved and the driver from drivers/staging/rtlwifi/
was removed in mainline kernel.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
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 cab07250..af20480f 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 -@@ -1313,6 +1313,7 @@ EXPORT_SYMBOL_GPL(usbnet_tx_timeout); +@@ -1302,6 +1302,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; -@@ -1345,6 +1346,12 @@ static int build_dma_sg(const struct sk_ +@@ -1334,6 +1335,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) -@@ -1401,12 +1408,19 @@ netdev_tx_t usbnet_start_xmit (struct sk +@@ -1390,12 +1397,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; -@@ -1473,7 +1487,9 @@ not_drop: +@@ -1467,7 +1481,9 @@ not_drop: if (skb) dev_kfree_skb_any (skb); if (urb) { @@ -51,7 +51,7 @@ usb_free_urb(urb); } } else -@@ -1526,7 +1542,9 @@ static void usbnet_bh (struct timer_list +@@ -1520,7 +1536,9 @@ static void usbnet_bh (struct timer_list rx_process (dev, skb); continue; case tx_done: @@ -61,7 +61,7 @@ /* fall through */ case rx_cleanup: usb_free_urb (entry->urb); -@@ -1894,7 +1912,9 @@ int usbnet_resume (struct usb_interface +@@ -1888,7 +1906,9 @@ int usbnet_resume (struct usb_interface retval = usb_submit_urb(res, GFP_ATOMIC); if (retval < 0) { dev_kfree_skb_any(skb); |