From: Ondrej Zary <linux@rainbow-software.org>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org,
Kernel development list <linux-kernel@vger.kernel.org>
Subject: [PATCH net-next-2.6] cx82310_eth: allow empty URBs
Date: Sat, 11 Sep 2010 17:40:16 +0200 [thread overview]
Message-ID: <201009111740.18843.linux@rainbow-software.org> (raw)
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
next reply other threads:[~2010-09-11 15:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-11 15:40 Ondrej Zary [this message]
2010-09-14 3:04 ` [PATCH net-next-2.6] cx82310_eth: allow empty URBs David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201009111740.18843.linux@rainbow-software.org \
--to=linux@rainbow-software.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).