cx82310_eth: allow empty URBs
Subsystems (3)
PATCH 1/1 cx82310_eth: allow empty URBs
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 <[email protected]>
drivers/net/usb/cx82310_eth.c +3 -9
@@ -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 usbnereturn 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 */
Signature · 1 line
Ondrej Zary
From: Ondrej Zary <[email protected]>
Date: Sat, 11 Sep 2010 17:40:16 +0200
Quoted 4 lines
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 <[email protected]>
Applied.