diff options
| author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2014-04-03 00:50:27 +0000 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2014-04-08 18:23:54 -0700 |
| commit | 369d49a955f325dcc9aa64e97999ab5e22dcf845 (patch) | |
| tree | 1aff17dba883e5c536173b9cea0d6a9fc4812d69 /patches/collateral-evolutions/network/78-usb-sg/usbnet.patch | |
| parent | cea2d7e7933f0ec8dd411e34af22ebd6bd24436e (diff) | |
backports: refresh patches for v3.14v3.14-1
mcgrof@drvbp1 ~/backports (git::linux-3.14.y)$ time \
./gentree.py --clean
--verbose --refresh /home/mcgrof/linux /home/mcgrof/build/linux-3.14/
real 1m32.443s
user 23m35.088s
sys 0m29.280s
$ time ckmake --allyesconfig
1 2.6.25 [ OK ]
2 2.6.26 [ OK ]
3 2.6.27 [ OK ]
4 2.6.28 [ OK ]
5 2.6.29 [ OK ]
6 2.6.30 [ OK ]
7 2.6.31 [ OK ]
8 2.6.32 [ OK ]
9 2.6.33 [ OK ]
10 2.6.34 [ OK ]
11 2.6.35 [ OK ]
12 2.6.36 [ OK ]
13 2.6.37 [ OK ]
14 2.6.38 [ OK ]
15 2.6.39 [ OK ]
16 3.0.101 [ OK ]
17 3.1.10 [ OK ]
18 3.2.54 [ OK ]
19 3.3.8 [ OK ]
20 3.4.79 [ OK ]
21 3.5.7 [ OK ]
22 3.6.11 [ OK ]
23 3.7.10 [ OK ]
24 3.8.13 [ OK ]
25 3.9.11 [ OK ]
26 3.10.29 [ OK ]
27 3.11.10 [ OK ]
28 3.12.10 [ OK ]
29 3.13.2 [ OK ]
30 3.14-rc1 [ OK ]
real 39m53.331s
user 1090m4.292s
sys 147m15.968s
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
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 9aaf5819..f78a86e2 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 -@@ -1225,6 +1225,7 @@ EXPORT_SYMBOL_GPL(usbnet_tx_timeout); +@@ -1227,6 +1227,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; -@@ -1257,6 +1258,12 @@ static int build_dma_sg(const struct sk_ +@@ -1259,6 +1260,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) -@@ -1313,12 +1320,19 @@ netdev_tx_t usbnet_start_xmit (struct sk +@@ -1315,12 +1322,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; -@@ -1373,7 +1387,9 @@ not_drop: +@@ -1375,7 +1389,9 @@ not_drop: if (skb) dev_kfree_skb_any (skb); if (urb) { @@ -51,7 +51,7 @@ usb_free_urb(urb); } } else -@@ -1426,7 +1442,9 @@ static void usbnet_bh (unsigned long par +@@ -1428,7 +1444,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); -@@ -1781,7 +1799,9 @@ int usbnet_resume (struct usb_interface +@@ -1785,7 +1803,9 @@ int usbnet_resume (struct usb_interface retval = usb_submit_urb(res, GFP_ATOMIC); if (retval < 0) { dev_kfree_skb_any(skb); |