summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/0025-usb-sg/usbnet.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-11-15 19:22:57 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2014-11-16 17:28:16 +0100
commit88dd709f949ddfd94284da646235e979b16f2cb9 (patch)
treea87e5d8e2f5c3e670ac9393006f1aedba5bf1505 /patches/collateral-evolutions/network/0025-usb-sg/usbnet.patch
parent004c85c536c9c8276f971ddd883a8e2e4233733f (diff)
backports: refresh patches on next-20141114
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.patch12
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 f928dbec..fa55b100 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
-@@ -1233,6 +1233,7 @@ EXPORT_SYMBOL_GPL(usbnet_tx_timeout);
+@@ -1252,6 +1252,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;
-@@ -1265,6 +1266,12 @@ static int build_dma_sg(const struct sk_
+@@ -1284,6 +1285,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)
-@@ -1321,12 +1328,19 @@ netdev_tx_t usbnet_start_xmit (struct sk
+@@ -1340,12 +1347,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;
-@@ -1381,7 +1395,9 @@ not_drop:
+@@ -1400,7 +1414,9 @@ not_drop:
if (skb)
dev_kfree_skb_any (skb);
if (urb) {
@@ -51,7 +51,7 @@
usb_free_urb(urb);
}
} else
-@@ -1434,7 +1450,9 @@ static void usbnet_bh (unsigned long par
+@@ -1453,7 +1469,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);
-@@ -1789,7 +1807,9 @@ int usbnet_resume (struct usb_interface
+@@ -1809,7 +1827,9 @@ int usbnet_resume (struct usb_interface
retval = usb_submit_urb(res, GFP_ATOMIC);
if (retval < 0) {
dev_kfree_skb_any(skb);