From 1262dce71218f5a7486411e2b7c2f7e79679c79c Mon Sep 17 00:00:00 2001 From: Ingo van Lil Date: Mon, 23 Apr 2012 22:05:38 +0000 Subject: [PATCH] --- yaml --- r: 299923 b: refs/heads/master c: 2a5809499e35b53a6044fd34e72b242688b7a862 h: refs/heads/master i: 299921: 92a48b3878a5c6ab96148fd5b5387954b3742715 299919: 426d98e8f77a25d6df2b283f377abfdcc5c1ce7e v: v3 --- [refs] | 2 +- trunk/drivers/net/usb/asix.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a690ab5d516e..7fe3e983a922 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ab8be4a14409c55050db69271631afebac29b5a +refs/heads/master: 2a5809499e35b53a6044fd34e72b242688b7a862 diff --git a/trunk/drivers/net/usb/asix.c b/trunk/drivers/net/usb/asix.c index 5ee032cafade..42b5151aa78a 100644 --- a/trunk/drivers/net/usb/asix.c +++ b/trunk/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));