From owner-svn-src-head@FreeBSD.ORG  Mon Jan 10 22:14:31 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1443C10657AF;
	Mon, 10 Jan 2011 22:14:31 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 034B78FC15;
	Mon, 10 Jan 2011 22:14:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0AMEUpw097020;
	Mon, 10 Jan 2011 22:14:30 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0AMEUKs097017;
	Mon, 10 Jan 2011 22:14:30 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201101102214.p0AMEUKs097017@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Mon, 10 Jan 2011 22:14:30 +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: r217244 - in head/sys/mips/cavium: . octe
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Mon, 10 Jan 2011 22:14:31 -0000

Author: jmallett
Date: Mon Jan 10 22:14:30 2011
New Revision: 217244
URL: http://svn.freebsd.org/changeset/base/217244

Log:
  Count output bytes and packets.

Modified:
  head/sys/mips/cavium/if_octm.c
  head/sys/mips/cavium/octe/ethernet-tx.c

Modified: head/sys/mips/cavium/if_octm.c
==============================================================================
--- head/sys/mips/cavium/if_octm.c	Mon Jan 10 22:14:08 2011	(r217243)
+++ head/sys/mips/cavium/if_octm.c	Mon Jan 10 22:14:30 2011	(r217244)
@@ -333,9 +333,12 @@ octm_transmit(struct ifnet *ifp, struct 
 
 	result = cvmx_mgmt_port_sendm(sc->sc_port, m);
 
-	if (result == CVMX_MGMT_PORT_SUCCESS)
+	if (result == CVMX_MGMT_PORT_SUCCESS) {
 		ETHER_BPF_MTAP(ifp, m);
-	else
+
+		ifp->if_opackets++;
+		ifp->if_obytes += m->m_pkthdr.len;
+	} else
 		ifp->if_oerrors++;
 
 	m_freem(m);

Modified: head/sys/mips/cavium/octe/ethernet-tx.c
==============================================================================
--- head/sys/mips/cavium/octe/ethernet-tx.c	Mon Jan 10 22:14:08 2011	(r217243)
+++ head/sys/mips/cavium/octe/ethernet-tx.c	Mon Jan 10 22:14:30 2011	(r217244)
@@ -247,6 +247,9 @@ int cvm_oct_xmit(struct mbuf *m, struct 
 
 		/* Pass it to any BPF listeners.  */
 		ETHER_BPF_MTAP(ifp, m);
+
+		ifp->if_opackets++;
+		ifp->if_obytes += m->m_pkthdr.len;
 	}
 
 	/* Free mbufs not in use by the hardware */