From owner-svn-src-head@FreeBSD.ORG  Sun Oct 14 22:58:12 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id B2A57346;
 Sun, 14 Oct 2012 22:58:12 +0000 (UTC)
 (envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 9AA558FC1C;
 Sun, 14 Oct 2012 22:58:12 +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 q9EMwCb7059333;
 Sun, 14 Oct 2012 22:58:12 GMT
 (envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9EMwCSS059331;
 Sun, 14 Oct 2012 22:58:12 GMT
 (envelope-from kientzle@svn.freebsd.org)
Message-Id: <201210142258.q9EMwCSS059331@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Sun, 14 Oct 2012 22:58:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r241562 - head/sys/arm/ti/cpsw
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Oct 2012 22:58:12 -0000

Author: kientzle
Date: Sun Oct 14 22:58:12 2012
New Revision: 241562
URL: http://svn.freebsd.org/changeset/base/241562

Log:
  Return correct packet size.

Modified:
  head/sys/arm/ti/cpsw/if_cpsw.c

Modified: head/sys/arm/ti/cpsw/if_cpsw.c
==============================================================================
--- head/sys/arm/ti/cpsw/if_cpsw.c	Sun Oct 14 22:33:17 2012	(r241561)
+++ head/sys/arm/ti/cpsw/if_cpsw.c	Sun Oct 14 22:58:12 2012	(r241562)
@@ -804,9 +804,9 @@ cpsw_intr_rx_locked(void *arg)
 		bus_dmamap_sync(sc->mbuf_dtag, sc->rx_dmamap[i], BUS_DMASYNC_POSTREAD);
 
 		/* Fill mbuf */
-		sc->rx_mbuf[i]->m_hdr.mh_data +=2;
-		sc->rx_mbuf[i]->m_len = bd.pktlen-2;
-		sc->rx_mbuf[i]->m_pkthdr.len = bd.pktlen-2;
+		sc->rx_mbuf[i]->m_hdr.mh_data += bd.bufoff;
+		sc->rx_mbuf[i]->m_hdr.mh_len = bd.pktlen - 4;
+		sc->rx_mbuf[i]->m_pkthdr.len = bd.pktlen - 4;
 		sc->rx_mbuf[i]->m_flags |= M_PKTHDR;
 		sc->rx_mbuf[i]->m_pkthdr.rcvif = ifp;