summaryrefslogtreecommitdiffstats
path: root/drivers/net/usb
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2007-06-27 08:14:50 +0200
committerJeff Garzik <jeff@garzik.org>2007-07-02 08:24:51 -0400
commit23de559b8d3537f972f325e7e015c18aa2e4d987 (patch)
treec4af26b642ede3383b5d814c14e7094ce1fb600c /drivers/net/usb
parent983b7dc07f083d7d78f408a6f841b399b954767d (diff)
downloadblackbird-op-linux-23de559b8d3537f972f325e7e015c18aa2e4d987.tar.gz
blackbird-op-linux-23de559b8d3537f972f325e7e015c18aa2e4d987.zip
dm9601: HW header size shouldn't be included in packet length
The dm9601 driver was including the 2 byte hardware header in the packet length, causing the HW to send 2 extra bytes of garbage on tx. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/usb')
-rw-r--r--drivers/net/usb/dm9601.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c
index a67638601477..ac200b0f6a92 100644
--- a/drivers/net/usb/dm9601.c
+++ b/drivers/net/usb/dm9601.c
@@ -489,6 +489,8 @@ static struct sk_buff *dm9601_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
b3..n: packet data
*/
+ len = skb->len;
+
if (skb_headroom(skb) < DM_TX_OVERHEAD) {
struct sk_buff *skb2;
@@ -501,10 +503,9 @@ static struct sk_buff *dm9601_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
__skb_push(skb, DM_TX_OVERHEAD);
- len = skb->len;
/* usbnet adds padding if length is a multiple of packet size
if so, adjust length value in header */
- if ((len % dev->maxpacket) == 0)
+ if ((skb->len % dev->maxpacket) == 0)
len++;
skb->data[0] = len;
OpenPOWER on IntegriCloud