diff options
| author |   Bjørn Mork <bjorn@mork.no> | 2012-10-07 18:52:35 +0200 |
|---|---|---|
| committer | Bjørn Mork <bjorn@mork.no> | 2012-10-18 22:39:40 +0200 |
| commit | 73f740cd5a3b6e999be4df9a7d6d78baa0033486 (patch) | |
| tree | 168d58259799f4206ff23d93732e40be9c5eb659 | |
| parent | db0fe0b2f6bba2fda939737d063db2ae14c58d71 (diff) | |
net: usbnet: make sure the queue lenght is at least 1
Some usbnet based devices may want to use a rx_urb_size
greater than RX_MAX_QUEUE_MEMORY. Prevent this from
creating a zero length rx queue.
Signed-off-by: Bjørn Mork <bjorn@mork.no>
| -rw-r--r-- | drivers/net/usb/usbnet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index f9819d10b1f..34b52056eee 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -65,9 +65,9 @@ */ #define RX_MAX_QUEUE_MEMORY (60 * 1518) #define RX_QLEN(dev) (((dev)->udev->speed == USB_SPEED_HIGH) ? \ - (RX_MAX_QUEUE_MEMORY/(dev)->rx_urb_size) : 4) + (1 + RX_MAX_QUEUE_MEMORY/(dev)->rx_urb_size) : 4) #define TX_QLEN(dev) (((dev)->udev->speed == USB_SPEED_HIGH) ? \ - (RX_MAX_QUEUE_MEMORY/(dev)->hard_mtu) : 4) + (1 + RX_MAX_QUEUE_MEMORY/(dev)->hard_mtu) : 4) // reawaken network queue this soon after stopping; else watchdog barks #define TX_TIMEOUT_JIFFIES (5*HZ) |