svn commit: r235612 - in stable/9/sys: i386/conf kern ofed/drivers/infiniband/ulp/ipoib

[John Baldwin]

Author: jhb
Date: Fri May 18 16:16:47 2012
New Revision: 235612
URL: http://svn.freebsd.org/changeset/base/235612

Log:
  MFC 234182:
  Don't update if_obytes when transmitting packets.  That is already done
  in IFQ_HANDOFF() when the packet is passed to the start routine, so doing
  it here resulted in double counting.

Modified:
  stable/9/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c
  stable/9/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/dev/   (props changed)
  stable/9/sys/dev/e1000/   (props changed)
  stable/9/sys/dev/ixgbe/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/i386/conf/XENHVM   (props changed)
  stable/9/sys/kern/subr_witness.c   (props changed)
  stable/9/sys/modules/   (props changed)

Modified: stable/9/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c
==============================================================================
--- stable/9/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c	Fri May 18 15:25:43 2012	(r235611)
+++ stable/9/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c	Fri May 18 16:16:47 2012	(r235612)
@@ -682,7 +682,6 @@ void ipoib_cm_handle_tx_wc(struct ipoib_
 
 	/* FIXME: is this right? Shouldn't we only increment on success? */
 	++dev->if_opackets;
-	dev->if_obytes += tx_req->mb->m_pkthdr.len;
 
 	m_freem(tx_req->mb);
 

Modified: stable/9/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c
==============================================================================
--- stable/9/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c	Fri May 18 15:25:43 2012	(r235611)
+++ stable/9/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c	Fri May 18 16:16:47 2012	(r235612)
@@ -345,7 +345,6 @@ static void ipoib_ib_handle_tx_wc(struct
 	ipoib_dma_unmap_tx(priv->ca, tx_req);
 
 	++dev->if_opackets;
-	dev->if_obytes += tx_req->mb->m_pkthdr.len;
 
 	m_freem(tx_req->mb);