From patchwork Wed May 13 20:10:41 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 27163 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 8C772B7079 for ; Thu, 14 May 2009 06:10:54 +1000 (EST) Received: by ozlabs.org (Postfix) id 7FF79DE006; Thu, 14 May 2009 06:10:54 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 1D903DDEE5 for ; Thu, 14 May 2009 06:10:54 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758164AbZEMUKn (ORCPT ); Wed, 13 May 2009 16:10:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756980AbZEMUKn (ORCPT ); Wed, 13 May 2009 16:10:43 -0400 Received: from mail-ew0-f176.google.com ([209.85.219.176]:61988 "EHLO mail-ew0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756914AbZEMUKm (ORCPT ); Wed, 13 May 2009 16:10:42 -0400 Received: by ewy24 with SMTP id 24so1079086ewy.37 for ; Wed, 13 May 2009 13:10:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:received:from:to:cc :subject:date:message-id:x-mailer; bh=3a9sU2Kvsike+HYLLT3Nb+LsHAAbj5t2KAomamLMdgM=; b=ECx8znRvenM/W0qFSrh8W8mnC1MBC8blW6RQSrKdhh1G69HQ+vdTj4do9IkokKp2gr zC+Nn1IOgKHTXzMaciIsYLHAQHP6CYtxk0/jG7SyQikejnq8CT2sVolahpfjZmXSxAUI ZfC9el627001jOcegbKisbm7l6yPk8Ai/rgI0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer; b=Z2Tt4xyODvZaenNmUhpo/CYvo6wEKmlaJIRf9VGGA2bQXy9Zt4d5W1LaxlAAHwtMON vVqmPW/53SGHhyteUp9xg0Iz7qFYS8+sW4DH8TrJ9qnyB6vyNMDqasq7srjXuFoBaLE2 1oUKwDRcyy825swnqXr3BtiQt3NjYNJChQVj0= Received: by 10.210.87.11 with SMTP id k11mr1754529ebb.7.1242245442827; Wed, 13 May 2009 13:10:42 -0700 (PDT) Received: from macbook.be.48ers.dk ([88.197.164.69]) by mx.google.com with ESMTPS id 23sm639134eya.59.2009.05.13.13.10.42 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 13 May 2009 13:10:42 -0700 (PDT) Received: by macbook.be.48ers.dk (Postfix, from userid 1000) id 16CFFC3A1B; Wed, 13 May 2009 22:10:41 +0200 (CEST) From: Peter Korsgaard To: netdev@vger.kernel.org, steve.glendinning@smsc.com, davem@davemloft.net Cc: Peter Korsgaard Subject: [PATCH 2/2] smsc95xx: strip ethernet fcs (crc) on receive path Date: Wed, 13 May 2009 22:10:41 +0200 Message-Id: <1242245441-15027-1-git-send-email-jacmet@sunsite.dk> X-Mailer: git-send-email 1.6.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The smsc95xx driver was forwarding the trailing fcs on received frames up the stack leading to confusion in tcpdump. Signed-off-by: Peter Korsgaard Tested-by: Steve Glendinning Acked-by: Steve Glendinning --- drivers/net/usb/smsc95xx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index 5a72833..89a91f8 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -1134,7 +1134,7 @@ static int smsc95xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb) if (skb->len == size) { if (pdata->use_rx_csum) smsc95xx_rx_csum_offload(skb); - + skb_trim(skb, skb->len - 4); /* remove fcs */ skb->truesize = size + sizeof(struct sk_buff); return 1; @@ -1152,7 +1152,7 @@ static int smsc95xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb) if (pdata->use_rx_csum) smsc95xx_rx_csum_offload(ax_skb); - + skb_trim(ax_skb, ax_skb->len - 4); /* remove fcs */ ax_skb->truesize = size + sizeof(struct sk_buff); usbnet_skb_return(dev, ax_skb);