Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 14 Feb 2011 16:38:32 +0000 (UTC)
From:      "Bjoern A. Zeeb" <bz@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r218683 - stable/8/sys/compat/linprocfs
Message-ID:  <201102141638.p1EGcWmf099270@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: bz
Date: Mon Feb 14 16:38:32 2011
New Revision: 218683
URL: http://svn.freebsd.org/changeset/base/218683

Log:
  MFC r218114:
  
    Update interface stats counters to match the current format in linux and
    try to export as much information as we can match.
  
    Requested on: Debian GNU/kFreeBSD list (debian-bsd lists.debian.org) 2010-12
    Tested by:    Mats Erik Andersson (mats.andersson gisladisker.se)

Modified:
  stable/8/sys/compat/linprocfs/linprocfs.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/compat/linprocfs/linprocfs.c
==============================================================================
--- stable/8/sys/compat/linprocfs/linprocfs.c	Mon Feb 14 16:36:02 2011	(r218682)
+++ stable/8/sys/compat/linprocfs/linprocfs.c	Mon Feb 14 16:38:32 2011	(r218683)
@@ -1214,20 +1214,43 @@ linprocfs_donetdev(PFS_FILL_ARGS)
 	char ifname[16]; /* XXX LINUX_IFNAMSIZ */
 	struct ifnet *ifp;
 
-	sbuf_printf(sb, "%6s|%58s|%s\n%6s|%58s|%58s\n",
-	    "Inter-", "   Receive", "  Transmit", " face",
-	    "bytes    packets errs drop fifo frame compressed",
-	    "bytes    packets errs drop fifo frame compressed");
+	sbuf_printf(sb, "%6s|%58s|%s\n"
+	    "%6s|%58s|%58s\n",
+	    "Inter-", "   Receive", "  Transmit",
+	    " face",
+	    "bytes    packets errs drop fifo frame compressed multicast",
+	    "bytes    packets errs drop fifo colls carrier compressed");
 
 	CURVNET_SET(TD_TO_VNET(curthread));
 	IFNET_RLOCK();
 	TAILQ_FOREACH(ifp, &V_ifnet, if_link) {
 		linux_ifname(ifp, ifname, sizeof ifname);
-			sbuf_printf(sb, "%6.6s:", ifname);
-		sbuf_printf(sb, "%8lu %7lu %4lu %4lu %4lu %5lu %10lu %9lu ",
-		    0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL);
+		sbuf_printf(sb, "%6.6s: ", ifname);
+		sbuf_printf(sb, "%7lu %7lu %4lu %4lu %4lu %5lu %10lu %9lu ",
+		    ifp->if_ibytes,	/* rx_bytes */
+		    ifp->if_ipackets,	/* rx_packets */
+		    ifp->if_ierrors,	/* rx_errors */
+		    ifp->if_iqdrops,	/* rx_dropped +
+					 * rx_missed_errors */
+		    0UL,		/* rx_fifo_errors */
+		    0UL,		/* rx_length_errors +
+					 * rx_over_errors +
+		    			 * rx_crc_errors +
+					 * rx_frame_errors */
+		    0UL,		/* rx_compressed */
+		    ifp->if_imcasts);	/* multicast, XXX-BZ rx only? */
 		sbuf_printf(sb, "%8lu %7lu %4lu %4lu %4lu %5lu %7lu %10lu\n",
-		    0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL);
+		    ifp->if_obytes,	/* tx_bytes */
+		    ifp->if_opackets,	/* tx_packets */
+		    ifp->if_oerrors,	/* tx_errors */
+		    0UL,		/* tx_dropped */
+		    0UL,		/* tx_fifo_errors */
+		    ifp->if_collisions,	/* collisions */
+		    0UL,		/* tx_carrier_errors +
+					 * tx_aborted_errors +
+					 * tx_window_errors +
+					 * tx_heartbeat_errors */
+		    0UL);		/* tx_compressed */
 	}
 	IFNET_RUNLOCK();
 	CURVNET_RESTORE();

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201102141638.p1EGcWmf099270>