From owner-svn-src-all@FreeBSD.ORG  Fri Sep 28 15:33:13 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D4ABB106566C;
	Fri, 28 Sep 2012 15:33:13 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BF8508FC0A;
	Fri, 28 Sep 2012 15:33:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8SFXDYT064354;
	Fri, 28 Sep 2012 15:33:13 GMT
	(envelope-from hselasky@svn.freebsd.org)
Received: (from hselasky@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8SFXDSa064351;
	Fri, 28 Sep 2012 15:33:13 GMT
	(envelope-from hselasky@svn.freebsd.org)
Message-Id: <201209281533.q8SFXDSa064351@svn.freebsd.org>
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Fri, 28 Sep 2012 15:33:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r241033 - head/sys/dev/usb/net
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Sep 2012 15:33:14 -0000

Author: hselasky
Date: Fri Sep 28 15:33:13 2012
New Revision: 241033
URL: http://svn.freebsd.org/changeset/base/241033

Log:
  Remove some trailing bytes which are not part of the ethernet packet.
  
  Discussed with:		bgray @

Modified:
  head/sys/dev/usb/net/if_smsc.c

Modified: head/sys/dev/usb/net/if_smsc.c
==============================================================================
--- head/sys/dev/usb/net/if_smsc.c	Fri Sep 28 15:24:14 2012	(r241032)
+++ head/sys/dev/usb/net/if_smsc.c	Fri Sep 28 15:33:13 2012	(r241033)
@@ -1042,7 +1042,9 @@ smsc_bulk_read_callback(struct usb_xfer 
 				}
 			
 				/* Finally enqueue the mbuf on the receive queue */
-				uether_rxmbuf(ue, m, pktlen);
+				/* Remove 4 trailing bytes */
+				if (pktlen >= (4 + ETHER_HDR_LEN))
+					uether_rxmbuf(ue, m, pktlen - 4);
 			}
 
 			/* Update the offset to move to the next potential packet */