Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 58147
b: refs/heads/master
c: 23de559
h: refs/heads/master
i:
  58145: 5860ed8
  58143: 4833c63
v: v3
  • Loading branch information
Peter Korsgaard authored and Jeff Garzik committed Jul 2, 2007
1 parent bdc0951 commit 8301f0b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 983b7dc07f083d7d78f408a6f841b399b954767d
refs/heads/master: 23de559b8d3537f972f325e7e015c18aa2e4d987
5 changes: 3 additions & 2 deletions trunk/drivers/net/usb/dm9601.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
Expand Down

0 comments on commit 8301f0b

Please sign in to comment.