From patchwork Fri Apr 20 10:00:21 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: 153995 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 76DE7B6EE7 for ; Fri, 20 Apr 2012 20:00:37 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753982Ab2DTKAf (ORCPT ); Fri, 20 Apr 2012 06:00:35 -0400 Received: from mailout-de.gmx.net ([213.165.64.23]:58757 "HELO mailout-de.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1753670Ab2DTKAe (ORCPT ); Fri, 20 Apr 2012 06:00:34 -0400 Received: (qmail invoked by alias); 20 Apr 2012 10:00:32 -0000 Received: from 50.250.80.212.static.versanetonline.de (EHLO zaphod.peppercon.de) [212.80.250.50] by mail.gmx.net (mp071) with SMTP; 20 Apr 2012 12:00:32 +0200 X-Authenticated: #3035711 X-Provags-ID: V01U2FsdGVkX19uL3xRn75uz1TK1Az2XyEOYnCuznj7KId33YHv1Z kFxdy7v5SvR+MS From: Ingo van Lil To: netdev@vger.kernel.org Cc: Ingo van Lil Subject: [PATCH] Fix tx transfer padding for full-speed USB Date: Fri, 20 Apr 2012 12:00:21 +0200 Message-Id: <1334916021-9124-1-git-send-email-inguin@gmx.de> X-Mailer: git-send-email 1.7.7.6 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..aeb2702 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) ? 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));