diff options
Diffstat (limited to 'drivers/net/usb/asix.c')
-rw-r--r-- | drivers/net/usb/asix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c index 3e33573a249..c44e0e489ba 100644 --- a/drivers/net/usb/asix.c +++ b/drivers/net/usb/asix.c | |||
@@ -398,7 +398,7 @@ static struct sk_buff *asix_tx_fixup(struct usbnet *dev, struct sk_buff *skb, | |||
398 | u32 packet_len; | 398 | u32 packet_len; |
399 | u32 padbytes = 0xffff0000; | 399 | u32 padbytes = 0xffff0000; |
400 | 400 | ||
401 | padlen = ((skb->len + 4) % 512) ? 0 : 4; | 401 | padlen = ((skb->len + 4) & (dev->maxpacket - 1)) ? 0 : 4; |
402 | 402 | ||
403 | if ((!skb_cloned(skb)) && | 403 | if ((!skb_cloned(skb)) && |
404 | ((headroom + tailroom) >= (4 + padlen))) { | 404 | ((headroom + tailroom) >= (4 + padlen))) { |
@@ -420,7 +420,7 @@ static struct sk_buff *asix_tx_fixup(struct usbnet *dev, struct sk_buff *skb, | |||
420 | cpu_to_le32s(&packet_len); | 420 | cpu_to_le32s(&packet_len); |
421 | skb_copy_to_linear_data(skb, &packet_len, sizeof(packet_len)); | 421 | skb_copy_to_linear_data(skb, &packet_len, sizeof(packet_len)); |
422 | 422 | ||
423 | if ((skb->len % 512) == 0) { | 423 | if (padlen) { |
424 | cpu_to_le32s(&padbytes); | 424 | cpu_to_le32s(&padbytes); |
425 | memcpy(skb_tail_pointer(skb), &padbytes, sizeof(padbytes)); | 425 | memcpy(skb_tail_pointer(skb), &padbytes, sizeof(padbytes)); |
426 | skb_put(skb, sizeof(padbytes)); | 426 | skb_put(skb, sizeof(padbytes)); |