diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
| commit | 9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb (patch) | |
| tree | 8d104ec2a459346b99413b0b77421ca7b9936c1a /drivers/net/usb | |
| parent | ca44d6e60f9de26281fda203f58b570e1748c015 (diff) | |
| parent | 45e3e1935e2857c54783291107d33323b3ef33c8 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/scsi/fcoe/fcoe.c
net/core/drop_monitor.c
net/core/net-traces.c
Diffstat (limited to 'drivers/net/usb')
| -rw-r--r-- | drivers/net/usb/usbnet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index c94de6243140..22c0585a0319 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c | |||
| @@ -429,7 +429,7 @@ static void rx_complete (struct urb *urb) | |||
| 429 | 429 | ||
| 430 | /* stalls need manual reset. this is rare ... except that | 430 | /* stalls need manual reset. this is rare ... except that |
| 431 | * when going through USB 2.0 TTs, unplug appears this way. | 431 | * when going through USB 2.0 TTs, unplug appears this way. |
| 432 | * we avoid the highspeed version of the ETIMEOUT/EILSEQ | 432 | * we avoid the highspeed version of the ETIMEDOUT/EILSEQ |
| 433 | * storm, recovering as needed. | 433 | * storm, recovering as needed. |
| 434 | */ | 434 | */ |
| 435 | case -EPIPE: | 435 | case -EPIPE: |