diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-10-24 22:34:38 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-10-25 11:17:39 +0200 |
| commit | 7e06d2ca763a6fc7db2f42c02018a927bc9e3e74 (patch) | |
| tree | d6fa23d568c6c6b87356c9898335c63c6f2c2014 /patches/collateral-evolutions/network/0025-usb-sg/usbnet.patch | |
| parent | e532523e2168b0e9b6690748e4c0a5b68a3e9901 (diff) | |
backports: refresh patches on next-20141003
1 3.0.101 [ OK ]
2 3.1.10 [ OK ]
3 3.2.62 [ OK ]
4 3.3.8 [ OK ]
5 3.4.103 [ 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.54 [ OK ]
12 3.11.10 [ OK ]
13 3.12.27 [ OK ]
14 3.13.11 [ OK ]
15 3.14.18 [ OK ]
16 3.15.10 [ OK ]
17 3.16.2 [ OK ]
18 3.17-rc3 [ OK ]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/0025-usb-sg/usbnet.patch')
| -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 6e2cdfe3..f928dbec 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 -@@ -1231,6 +1231,7 @@ EXPORT_SYMBOL_GPL(usbnet_tx_timeout); +@@ -1233,6 +1233,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; -@@ -1263,6 +1264,12 @@ static int build_dma_sg(const struct sk_ +@@ -1265,6 +1266,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) -@@ -1319,12 +1326,19 @@ netdev_tx_t usbnet_start_xmit (struct sk +@@ -1321,12 +1328,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; -@@ -1379,7 +1393,9 @@ not_drop: +@@ -1381,7 +1395,9 @@ not_drop: if (skb) dev_kfree_skb_any (skb); if (urb) { @@ -51,7 +51,7 @@ usb_free_urb(urb); } } else -@@ -1432,7 +1448,9 @@ static void usbnet_bh (unsigned long par +@@ -1434,7 +1450,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); -@@ -1787,7 +1805,9 @@ int usbnet_resume (struct usb_interface +@@ -1789,7 +1807,9 @@ int usbnet_resume (struct usb_interface retval = usb_submit_urb(res, GFP_ATOMIC); if (retval < 0) { dev_kfree_skb_any(skb); |