[PATCHv3 net 5/5] nfp: don't trust netif_running() in debug code
From: Jakub Kicinski <hidden>
Date: 2016-02-18 20:38:23
Subsystem:
netronome ethernet drivers, networking drivers, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Since change_mtu() can fail and leave us with netif_running() returning true even though all rings were freed - we should look at NFP_NET_CFG_CTRL_ENABLE flag to determine if device is really opened. Signed-off-by: Jakub Kicinski <redacted> --- drivers/net/ethernet/netronome/nfp/nfp_net_debugfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_debugfs.c b/drivers/net/ethernet/netronome/nfp/nfp_net_debugfs.c
index 4c97c713121c..7af404d492cc 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_debugfs.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_debugfs.c@@ -52,7 +52,7 @@ static int nfp_net_debugfs_rx_q_read(struct seq_file *file, void *data) if (!rx_ring->r_vec || !rx_ring->r_vec->nfp_net) goto out; nn = rx_ring->r_vec->nfp_net; - if (!netif_running(nn->netdev)) + if (!(nn->ctrl & NFP_NET_CFG_CTRL_ENABLE)) goto out; rxd_cnt = rx_ring->cnt;
@@ -127,7 +127,7 @@ static int nfp_net_debugfs_tx_q_read(struct seq_file *file, void *data) if (!tx_ring->r_vec || !tx_ring->r_vec->nfp_net) goto out; nn = tx_ring->r_vec->nfp_net; - if (!netif_running(nn->netdev)) + if (!(nn->ctrl & NFP_NET_CFG_CTRL_ENABLE)) goto out; txd_cnt = tx_ring->cnt;
--
1.9.1