* [PATCH net-next-2.6] cx82310_eth: allow empty URBs
@ 2010-09-11 15:40 Ondrej Zary
2010-09-14 3:04 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Ondrej Zary @ 2010-09-11 15:40 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Kernel development list
Empty received URBs are currently counted as errors but the device sends them
sometimes as part of regular traffic - so remove this check.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
--- linux-2.6.36-rc3-/drivers/net/usb/cx82310_eth.c 2010-09-11 17:31:44.000000000 +0200
+++ linux-2.6.36-rc3/drivers/net/usb/cx82310_eth.c 2010-09-11 17:21:22.000000000 +0200
@@ -150,11 +150,11 @@ static int cx82310_bind(struct usbnet *d
/*
* this must not include ethernet header as the device can send partial
- * packets with no header (URB is at least 2 bytes long, so 2 is OK)
+ * packets with no header (and sometimes even empty URBs)
*/
- dev->net->hard_header_len = 2;
+ dev->net->hard_header_len = 0;
/* we can send at most 1514 bytes of data (+ 2-byte header) per URB */
- dev->hard_mtu = CX82310_MTU + dev->net->hard_header_len;
+ dev->hard_mtu = CX82310_MTU + 2;
/* we can receive URBs up to 4KB from the device */
dev->rx_urb_size = 4096;
@@ -228,12 +228,6 @@ static int cx82310_rx_fixup(struct usbne
return 1;
}
- if (skb->len < 2) {
- dev_err(&dev->udev->dev, "RX frame too short: %d B\n",
- skb->len);
- return 0;
- }
-
/* a skb can contain multiple packets */
while (skb->len > 1) {
/* first two bytes are packet length */
--
Ondrej Zary
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH net-next-2.6] cx82310_eth: allow empty URBs
2010-09-11 15:40 [PATCH net-next-2.6] cx82310_eth: allow empty URBs Ondrej Zary
@ 2010-09-14 3:04 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-09-14 3:04 UTC (permalink / raw)
To: linux; +Cc: netdev, linux-kernel
From: Ondrej Zary <linux@rainbow-software.org>
Date: Sat, 11 Sep 2010 17:40:16 +0200
> Empty received URBs are currently counted as errors but the device sends them
> sometimes as part of regular traffic - so remove this check.
>
> Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-09-14 3:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-09-11 15:40 [PATCH net-next-2.6] cx82310_eth: allow empty URBs Ondrej Zary
2010-09-14 3:04 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.