Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 333ef9d1 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller
Browse files

s390/qeth: don't keep statistics for tx timeout 



struct netdev_queue contains a counter for tx timeouts, which gets
updated by dev_watchdog(). So let's not attempt to maintain our own
statistics, in particular not by overloading the skb-error counter.

Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fdd1a530

drivers/s390/net/qeth_core.h

+0 −1
Original line number Diff line number Diff line
@@ -464,7 +464,6 @@ struct qeth_card_stats { 
	u64 rx_errors;

	u64 rx_dropped;

	u64 rx_multicast;

	u64 tx_errors;

};



struct qeth_out_q_stats {

drivers/s390/net/qeth_core_main.c

+0 −2
Original line number Diff line number Diff line
@@ -4340,7 +4340,6 @@ void qeth_tx_timeout(struct net_device *dev) 


	card = dev->ml_priv;

	QETH_CARD_TEXT(card, 4, "txtimeo");

	QETH_CARD_STAT_INC(card, tx_errors);

	qeth_schedule_recovery(card);

}

EXPORT_SYMBOL_GPL(qeth_tx_timeout);
@@ -6192,7 +6191,6 @@ void qeth_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats) 
	stats->rx_errors = card->stats.rx_errors;

	stats->rx_dropped = card->stats.rx_dropped;

	stats->multicast = card->stats.rx_multicast;

	stats->tx_errors = card->stats.tx_errors;



	for (i = 0; i < card->qdio.no_out_queues; i++) {

		queue = card->qdio.out_qs[i];