提交 333ef9d1 编写于 作者: J Julian Wiedmann 提交者: David S. Miller

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: NJulian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 fdd1a530
...@@ -464,7 +464,6 @@ struct qeth_card_stats { ...@@ -464,7 +464,6 @@ struct qeth_card_stats {
u64 rx_errors; u64 rx_errors;
u64 rx_dropped; u64 rx_dropped;
u64 rx_multicast; u64 rx_multicast;
u64 tx_errors;
}; };
struct qeth_out_q_stats { struct qeth_out_q_stats {
......
...@@ -4340,7 +4340,6 @@ void qeth_tx_timeout(struct net_device *dev) ...@@ -4340,7 +4340,6 @@ void qeth_tx_timeout(struct net_device *dev)
card = dev->ml_priv; card = dev->ml_priv;
QETH_CARD_TEXT(card, 4, "txtimeo"); QETH_CARD_TEXT(card, 4, "txtimeo");
QETH_CARD_STAT_INC(card, tx_errors);
qeth_schedule_recovery(card); qeth_schedule_recovery(card);
} }
EXPORT_SYMBOL_GPL(qeth_tx_timeout); EXPORT_SYMBOL_GPL(qeth_tx_timeout);
...@@ -6192,7 +6191,6 @@ void qeth_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats) ...@@ -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_errors = card->stats.rx_errors;
stats->rx_dropped = card->stats.rx_dropped; stats->rx_dropped = card->stats.rx_dropped;
stats->multicast = card->stats.rx_multicast; stats->multicast = card->stats.rx_multicast;
stats->tx_errors = card->stats.tx_errors;
for (i = 0; i < card->qdio.no_out_queues; i++) { for (i = 0; i < card->qdio.no_out_queues; i++) {
queue = card->qdio.out_qs[i]; queue = card->qdio.out_qs[i];
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册