summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Mason <jdmason@kudzu.us>2013-09-04 20:26:01 +0200
committerDavid S. Miller <davem@davemloft.net>2013-09-05 20:27:32 +0200
commitdfafb73f355940989507c56b9282773132e86a9f (patch)
tree955540319fa2b50a809103a84523aaf855e77128
parentethernet/arc/arc_emac: Fix huge delays in large file copies (diff)
downloadlinux-dfafb73f355940989507c56b9282773132e86a9f.tar.xz
linux-dfafb73f355940989507c56b9282773132e86a9f.zip
icplus: Use netif_running to determine device state
Remove the __LINK_STATE_START check to verify the device is running, in favor of netif_running(). netif_running() performs the same check of __LINK_STATE_START, so the code should behave the same. Signed-off-by: Jon Mason <jdmason@kudzu.us> Cc: Francois Romieu <romieu@fr.zoreil.com> Cc: Sorbica Shieh <sorbica@icplus.com.tw> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/icplus/ipg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/icplus/ipg.c b/drivers/net/ethernet/icplus/ipg.c
index 1fde90b96685..bdf5023724e7 100644
--- a/drivers/net/ethernet/icplus/ipg.c
+++ b/drivers/net/ethernet/icplus/ipg.c
@@ -1004,7 +1004,7 @@ static struct net_device_stats *ipg_nic_get_stats(struct net_device *dev)
/* Check to see if the NIC has been initialized via nic_open,
* before trying to read statistic registers.
*/
- if (!test_bit(__LINK_STATE_START, &dev->state))
+ if (!netif_running(dev))
return &sp->stats;
sp->stats.rx_packets += ipg_r32(IPG_FRAMESRCVDOK);