diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-11-21 17:53:08 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-11-21 23:34:58 +0100 |
| commit | 92ad5c2ee4e441b0b366698d77facbf0258e59ad (patch) | |
| tree | a67c2840a8b093d4ef583c64f2963f4ecb50c30b /patches/collateral-evolutions/network/78-usb-sg/usbnet.patch | |
| parent | bf4ede990a6d26d93e760d2b98065a4afaaefbd5 (diff) | |
backports: refresh on next-20131121backports-20131121
== ckmake-report.log ==
1 2.6.24 [ FAIL ]
2 2.6.25 [ OK ]
3 2.6.26 [ OK ]
4 2.6.27 [ OK ]
5 2.6.28 [ OK ]
6 2.6.29 [ OK ]
7 2.6.30 [ OK ]
8 2.6.31 [ OK ]
9 2.6.32 [ OK ]
10 2.6.33 [ OK ]
11 2.6.34 [ OK ]
12 2.6.35 [ OK ]
13 2.6.36 [ OK ]
14 2.6.37 [ OK ]
15 2.6.38 [ OK ]
16 2.6.39 [ OK ]
17 3.0.101 [ OK ]
18 3.1.10 [ OK ]
19 3.10.17 [ OK ]
20 3.11.6 [ OK ]
21 3.12-rc7 [ OK ]
22 3.2.52 [ OK ]
23 3.3.8 [ OK ]
24 3.4.67 [ OK ]
25 3.5.7 [ OK ]
26 3.6.11 [ OK ]
27 3.7.10 [ OK ]
28 3.8.13 [ OK ]
29 3.9.11 [ OK ]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/78-usb-sg/usbnet.patch')
| -rw-r--r-- | patches/collateral-evolutions/network/78-usb-sg/usbnet.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/patches/collateral-evolutions/network/78-usb-sg/usbnet.patch b/patches/collateral-evolutions/network/78-usb-sg/usbnet.patch index 08499d8b..6e2cdfe3 100644 --- a/patches/collateral-evolutions/network/78-usb-sg/usbnet.patch +++ b/patches/collateral-evolutions/network/78-usb-sg/usbnet.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c -@@ -1234,6 +1234,7 @@ EXPORT_SYMBOL_GPL(usbnet_tx_timeout); +@@ -1231,6 +1231,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; -@@ -1266,6 +1267,12 @@ static int build_dma_sg(const struct sk_ +@@ -1263,6 +1264,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) -@@ -1322,12 +1329,19 @@ netdev_tx_t usbnet_start_xmit (struct sk +@@ -1319,12 +1326,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; -@@ -1382,7 +1396,9 @@ not_drop: +@@ -1379,7 +1393,9 @@ not_drop: if (skb) dev_kfree_skb_any (skb); if (urb) { @@ -51,7 +51,7 @@ usb_free_urb(urb); } } else -@@ -1435,7 +1451,9 @@ static void usbnet_bh (unsigned long par +@@ -1432,7 +1448,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); -@@ -1790,7 +1808,9 @@ int usbnet_resume (struct usb_interface +@@ -1787,7 +1805,9 @@ int usbnet_resume (struct usb_interface retval = usb_submit_urb(res, GFP_ATOMIC); if (retval < 0) { dev_kfree_skb_any(skb); |