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 5ee032cafade..42b5151aa78a 100644 --- a/drivers/net/usb/asix.c +++ b/drivers/net/usb/asix.c | |||
| @@ -355,7 +355,7 @@ static struct sk_buff *asix_tx_fixup(struct usbnet *dev, struct sk_buff *skb, | |||
| 355 | u32 packet_len; | 355 | u32 packet_len; |
| 356 | u32 padbytes = 0xffff0000; | 356 | u32 padbytes = 0xffff0000; |
| 357 | 357 | ||
| 358 | padlen = ((skb->len + 4) % 512) ? 0 : 4; | 358 | padlen = ((skb->len + 4) & (dev->maxpacket - 1)) ? 0 : 4; |
| 359 | 359 | ||
| 360 | if ((!skb_cloned(skb)) && | 360 | if ((!skb_cloned(skb)) && |
| 361 | ((headroom + tailroom) >= (4 + padlen))) { | 361 | ((headroom + tailroom) >= (4 + padlen))) { |
| @@ -377,7 +377,7 @@ static struct sk_buff *asix_tx_fixup(struct usbnet *dev, struct sk_buff *skb, | |||
| 377 | cpu_to_le32s(&packet_len); | 377 | cpu_to_le32s(&packet_len); |
| 378 | skb_copy_to_linear_data(skb, &packet_len, sizeof(packet_len)); | 378 | skb_copy_to_linear_data(skb, &packet_len, sizeof(packet_len)); |
| 379 | 379 | ||
| 380 | if ((skb->len % 512) == 0) { | 380 | if (padlen) { |
| 381 | cpu_to_le32s(&padbytes); | 381 | cpu_to_le32s(&padbytes); |
| 382 | memcpy(skb_tail_pointer(skb), &padbytes, sizeof(padbytes)); | 382 | memcpy(skb_tail_pointer(skb), &padbytes, sizeof(padbytes)); |
| 383 | skb_put(skb, sizeof(padbytes)); | 383 | skb_put(skb, sizeof(padbytes)); |
