[PATCH net-next 01/14] net: usbnet: make sure the queue lenght is at least 1
flat view
STALE5105d
From: Bjørn Mork <bjorn@mork.no>
Date: 2012-10-18 20:42:26
Subsystem:
networking drivers, the rest, usb "usbnet" driver framework, usb networking drivers · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds, Oliver Neukum
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> --- drivers/net/usb/usbnet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index f9819d1..34b5205 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)
--
1.7.10.4