From patchwork Mon Dec 16 10:35:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 301619 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 BA2952C009A for ; Mon, 16 Dec 2013 21:36:02 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753332Ab3LPKf7 (ORCPT ); Mon, 16 Dec 2013 05:35:59 -0500 Received: from mail-ee0-f41.google.com ([74.125.83.41]:55492 "EHLO mail-ee0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752493Ab3LPKft (ORCPT ); Mon, 16 Dec 2013 05:35:49 -0500 Received: by mail-ee0-f41.google.com with SMTP id t10so2133761eei.14 for ; Mon, 16 Dec 2013 02:35:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=4Sc7NQBB5VP4ZIhZbLirOqfnazD9E0GjQ9cgdvzNA5M=; b=rCMB7XlE86rtdov+mKDSjY5IRhFcQEw7E0XnBBVNrJvfbZ/nmgBMZNjwlbZvXCojZo YVmoN3dbqzAPJfkNdwbCreOM0dN0fRkJ78GPqsGYNOZ+Pg9WSt9DGmfozgJrJDy6OKQm x2Iq5ma+Ps3YH6WLvgx5S/NKpQYww4lMP+qKchmkm5/FSG9LnuJWYa4ajVqemuHQpkr4 QabjqM2MsRYvk8MKSgbMb0tiYE3DAzCG8STz5tTEkCMJvWOyT0CthPd01lK7is4obgJY qQTK2KUQIeoIaiKgJkZ/9h65vTQI8jkfBrL+BLEefN/UiGMiWbALOnVqBObTxSZr3YpR HXbw== X-Received: by 10.14.175.131 with SMTP id z3mr16013877eel.65.1387190148387; Mon, 16 Dec 2013 02:35:48 -0800 (PST) Received: from dell.be.48ers.dk ([91.183.168.190]) by mx.google.com with ESMTPSA id p45sm40673632eeg.1.2013.12.16.02.35.46 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 16 Dec 2013 02:35:47 -0800 (PST) Received: from peko by dell.be.48ers.dk with local (Exim 4.80) (envelope-from ) id 1VsVWb-0004Rr-6q; Mon, 16 Dec 2013 11:35:45 +0100 From: Peter Korsgaard To: netdev@vger.kernel.org, davem@davemloft.net Cc: joseph_chang@davicom.com.tw, Peter Korsgaard , Subject: [PATCH 2/4] dm9601: fix reception of full size ethernet frames on dm9620/dm9621a Date: Mon, 16 Dec 2013 11:35:33 +0100 Message-Id: <1387190135-17052-3-git-send-email-peter@korsgaard.com> X-Mailer: git-send-email 1.8.5.1 In-Reply-To: <1387190135-17052-1-git-send-email-peter@korsgaard.com> References: <1387190135-17052-1-git-send-email-peter@korsgaard.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org dm9620/dm9621a require room for 4 byte padding even in dm9601 (3 byte header) mode. Cc: Signed-off-by: Peter Korsgaard --- drivers/net/usb/dm9601.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c index 8e88572..aca0285 100644 --- a/drivers/net/usb/dm9601.c +++ b/drivers/net/usb/dm9601.c @@ -364,7 +364,12 @@ static int dm9601_bind(struct usbnet *dev, struct usb_interface *intf) dev->net->ethtool_ops = &dm9601_ethtool_ops; dev->net->hard_header_len += DM_TX_OVERHEAD; dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len; - dev->rx_urb_size = dev->net->mtu + ETH_HLEN + DM_RX_OVERHEAD; + + /* dm9620/21a require room for 4 byte padding, even in dm9601 + * mode, so we need +1 to be able to receive full size + * ethernet frames. + */ + dev->rx_urb_size = dev->net->mtu + ETH_HLEN + DM_RX_OVERHEAD + 1; dev->mii.dev = dev->net; dev->mii.mdio_read = dm9601_mdio_read;