Commit 7393b87c authored by Thomas Klein's avatar Thomas Klein Committed by Jeff Garzik
Browse files

ehea: Improve tx packets counting 



Using own tx_packets counter instead of firmware counters.

Signed-off-by: default avatarThomas Klein <tklein@de.ibm.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent a9b121c4

drivers/net/ehea/ehea.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#include <asm/io.h>



#define DRV_NAME	"ehea"

#define DRV_VERSION	"EHEA_0080"

#define DRV_VERSION	"EHEA_0082"



/* eHEA capability flags */

#define DLPAR_PORT_ADD_REM 1

drivers/net/ehea/ehea_main.c

+7 −2
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static struct net_device_stats *ehea_get_stats(struct net_device *dev) 
	struct ehea_port *port = netdev_priv(dev);

	struct net_device_stats *stats = &port->stats;

	struct hcp_ehea_port_cb2 *cb2;

	u64 hret, rx_packets;

	u64 hret, rx_packets, tx_packets;

	int i;



	memset(stats, 0, sizeof(*stats));
@@ -162,7 +162,11 @@ static struct net_device_stats *ehea_get_stats(struct net_device *dev) 
	for (i = 0; i < port->num_def_qps; i++)

		rx_packets += port->port_res[i].rx_packets;



	stats->tx_packets = cb2->txucp + cb2->txmcp + cb2->txbcp;

	tx_packets = 0;

	for (i = 0; i < port->num_def_qps + port->num_add_tx_qps; i++)

		tx_packets += port->port_res[i].tx_packets;



	stats->tx_packets = tx_packets;

	stats->multicast = cb2->rxmcp;

	stats->rx_errors = cb2->rxuerr;

	stats->rx_bytes = cb2->rxo;
@@ -2000,6 +2004,7 @@ static int ehea_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	}



	ehea_post_swqe(pr->qp, swqe);

	pr->tx_packets++;



	if (unlikely(atomic_read(&pr->swqe_avail) <= 1)) {

		spin_lock_irqsave(&pr->netif_queue, flags);