diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-02-21 19:35:19 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-02-22 02:36:50 +0100 |
commit | dd4a670a90f21e83fa771f258ec8a48ef394abaf (patch) | |
tree | 37a27df947b4c65cc545d4b7ab3a52ec0817c8f7 /patches/collateral-evolutions/network/0025-usb-sg | |
parent | cbf984850b5a232d1bb7247edec357e3aa04fa45 (diff) |
patches: refresh patches on next-20150129backports-20150129
1 3.0.101 [ OK ]
2 3.1.10 [ OK ]
3 3.2.67 [ OK ]
4 3.3.8 [ OK ]
5 3.4.106 [ OK ]
6 3.5.7 [ OK ]
7 3.6.11 [ OK ]
8 3.7.10 [ OK ]
9 3.8.13 [ OK ]
10 3.9.11 [ OK ]
11 3.10.69 [ OK ]
12 3.11.10 [ OK ]
13 3.12.38 [ OK ]
14 3.13.11 [ OK ]
15 3.14.33 [ OK ]
16 3.15.10 [ OK ]
17 3.16.7 [ OK ]
18 3.17.8 [ OK ]
19 3.18.7 [ OK ]
20 3.19.0 [ OK ]
manual changes do to:
patches/collateral-evolutions/network/0049-no-pfmemalloc/igb.patch
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/0025-usb-sg')
-rw-r--r-- | patches/collateral-evolutions/network/0025-usb-sg/usbnet.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/patches/collateral-evolutions/network/0025-usb-sg/usbnet.patch b/patches/collateral-evolutions/network/0025-usb-sg/usbnet.patch index fa55b100..6d556b97 100644 --- a/patches/collateral-evolutions/network/0025-usb-sg/usbnet.patch +++ b/patches/collateral-evolutions/network/0025-usb-sg/usbnet.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c -@@ -1252,6 +1252,7 @@ EXPORT_SYMBOL_GPL(usbnet_tx_timeout); +@@ -1251,6 +1251,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; -@@ -1284,6 +1285,12 @@ static int build_dma_sg(const struct sk_ +@@ -1283,6 +1284,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) -@@ -1340,12 +1347,19 @@ netdev_tx_t usbnet_start_xmit (struct sk +@@ -1339,12 +1346,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; -@@ -1400,7 +1414,9 @@ not_drop: +@@ -1399,7 +1413,9 @@ not_drop: if (skb) dev_kfree_skb_any (skb); if (urb) { @@ -51,7 +51,7 @@ usb_free_urb(urb); } } else -@@ -1453,7 +1469,9 @@ static void usbnet_bh (unsigned long par +@@ -1452,7 +1468,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); -@@ -1809,7 +1827,9 @@ int usbnet_resume (struct usb_interface +@@ -1808,7 +1826,9 @@ int usbnet_resume (struct usb_interface retval = usb_submit_urb(res, GFP_ATOMIC); if (retval < 0) { dev_kfree_skb_any(skb); |