From patchwork Tue Apr 24 08:05:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ingo van Lil X-Patchwork-Id: 154617 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 5D2A3B6FDD for ; Tue, 24 Apr 2012 18:06:07 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755561Ab2DXIGE (ORCPT ); Tue, 24 Apr 2012 04:06:04 -0400 Received: from mailout-de.gmx.net ([213.165.64.22]:55553 "HELO mailout-de.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1755270Ab2DXIGA (ORCPT ); Tue, 24 Apr 2012 04:06:00 -0400 Received: (qmail invoked by alias); 24 Apr 2012 08:05:58 -0000 Received: from 50.250.80.212.static.versanetonline.de (EHLO zaphod.peppercon.de) [212.80.250.50] by mail.gmx.net (mp038) with SMTP; 24 Apr 2012 10:05:58 +0200 X-Authenticated: #3035711 X-Provags-ID: V01U2FsdGVkX19UrEx9fShUsLf7VhST2b4JoyPRIU/FR/5EcWu9ga T+RSk9F76kHUNO From: Ingo van Lil To: David Miller Cc: netdev@vger.kernel.org, Ingo van Lil Subject: [PATCH] Fix tx transfer padding for full-speed USB Date: Tue, 24 Apr 2012 10:05:38 +0200 Message-Id: <1335254738-12605-1-git-send-email-inguin@gmx.de> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <20120424.002808.1711965470884592541.davem@davemloft.net> References: <20120424.002808.1711965470884592541.davem@davemloft.net> X-Y-GMX-Trusted: 0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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));