diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 23:59:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 23:59:43 -0800 |
| commit | ba6edf537004b1c68a0736c95ebe39a30a2537fb (patch) | |
| tree | b4a2cd81ca09ab6cd8e442458d6da722422ad952 /drivers/usb/usbnet.c | |
| parent | d0415686774477153ca911a612f74c2d2bb11be6 (diff) | |
v2.5.1.4 -> v2.5.1.5
- Dave Jones: more merging, fix up last merge..
- release to sync with Dave
Diffstat (limited to 'drivers/usb/usbnet.c')
| -rw-r--r-- | drivers/usb/usbnet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/usbnet.c b/drivers/usb/usbnet.c index 033ad12eb0bc..9ca8765c792e 100644 --- a/drivers/usb/usbnet.c +++ b/drivers/usb/usbnet.c @@ -1577,7 +1577,7 @@ static int usbnet_start_xmit (struct sk_buff *skb, struct net_device *net) struct nc_trailer *trailer = 0; #endif /* CONFIG_USB_NET1080 */ - flags = in_interrupt () ? GFP_ATOMIC : GFP_KERNEL; + flags = in_interrupt () ? GFP_ATOMIC : GFP_NOIO; /* might be used for nfs */ // some devices want funky USB-level framing, for // win32 driver (usually) and/or hardware quirks |