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-09 10:53:48 +0200 |
| commit | dadf9eb9e185aae3c986aee6d11e37fbf3cd9966 (patch) | |
| tree | cfd120062075e916676aeff2724218489d8c0326 | |
| parent | 7fe0b14b725d6d09a1d9e1409bd465cb88b587f9 (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 fc9f578a1e2..7ad121905ba 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) |