summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Neukum <oliver@neukum.name>2002-12-18 20:11:06 -0800
committerGreg Kroah-Hartman <greg@kroah.com>2002-12-18 20:11:06 -0800
commitafa738202bec33b08989ca60c6f93d20af053053 (patch)
treef00eab8eef895a5d175a67177ec2b61f4eb0d88f
parente26d349a1f71ebc40e91d6af158d07ac2ab32cbd (diff)
[PATCH] USB cdc-ether: GFP_KERNEL in interrupt
cdc-ether has the same problem as cdc-acm. - usb_submit_urb() under spinlock or in interrupt must use GFP_ATOMIC
-rw-r--r--drivers/usb/net/cdc-ether.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/net/cdc-ether.c b/drivers/usb/net/cdc-ether.c
index 5c8c1998eee9..46271a3c1e64 100644
--- a/drivers/usb/net/cdc-ether.c
+++ b/drivers/usb/net/cdc-ether.c
@@ -132,7 +132,7 @@ goon:
// Give this to the USB subsystem so it can tell us
// when more data arrives.
- if ( (res = usb_submit_urb(ether_dev->rx_urb, GFP_KERNEL)) ) {
+ if ( (res = usb_submit_urb(ether_dev->rx_urb, GFP_ATOMIC)) ) {
warn("%s failed submint rx_urb %d", __FUNCTION__, res);
}
@@ -302,7 +302,7 @@ static int CDCEther_start_xmit( struct sk_buff *skb, struct net_device *net )
ether_dev->tx_urb->transfer_buffer_length = count;
// Send the URB on its merry way.
- if ((res = usb_submit_urb(ether_dev->tx_urb, GFP_KERNEL))) {
+ if ((res = usb_submit_urb(ether_dev->tx_urb, GFP_ATOMIC))) {
// Hmm... It didn't go. Tell someone...
warn("failed tx_urb %d", res);
// update some stats...