lkml.org 
[lkml]   [2010]   [Sep]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH net-next-2.6] cx82310_eth: allow empty URBs
Date
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


\
 
 \ /
  Last update: 2010-09-11 17:43    [from the cache]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and my Meterkast|Read the blog