diff options
| author | Ingo van Lil <inguin@gmx.de> | 2012-04-23 22:05:38 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-24 04:11:34 -0400 |
| commit | 2a5809499e35b53a6044fd34e72b242688b7a862 (patch) | |
| tree | 137a4956069215c6163f999c19f9c3c9fa5d1a1e /drivers/net/usb/asix.c | |
| parent | 1ab8be4a14409c55050db69271631afebac29b5a (diff) | |
| download | kernel_goldelico_gta04-2a5809499e35b53a6044fd34e72b242688b7a862.zip kernel_goldelico_gta04-2a5809499e35b53a6044fd34e72b242688b7a862.tar.gz kernel_goldelico_gta04-2a5809499e35b53a6044fd34e72b242688b7a862.tar.bz2 | |
asix: Fix tx transfer padding for full-speed USB
The asix.c USB Ethernet driver avoids ending a tx transfer with a zero-
length packet by appending a four-byte padding to transfers whose length
is a multiple of maxpacket. However, the hard-coded 512 byte maxpacket
length is valid for high-speed USB only; full-speed USB uses 64 byte
packets.
Signed-off-by: Ingo van Lil <inguin@gmx.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
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 5ee032c..42b5151 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, u32 packet_len; u32 padbytes = 0xffff0000; - padlen = ((skb->len + 4) % 512) ? 0 : 4; + padlen = ((skb->len + 4) & (dev->maxpacket - 1)) ? 0 : 4; if ((!skb_cloned(skb)) && ((headroom + tailroom) >= (4 + padlen))) { @@ -377,7 +377,7 @@ static struct sk_buff *asix_tx_fixup(struct usbnet *dev, struct sk_buff *skb, cpu_to_le32s(&packet_len); skb_copy_to_linear_data(skb, &packet_len, sizeof(packet_len)); - if ((skb->len % 512) == 0) { + if (padlen) { cpu_to_le32s(&padbytes); memcpy(skb_tail_pointer(skb), &padbytes, sizeof(padbytes)); skb_put(skb, sizeof(padbytes)); |