icplus: Use netif_running to determine device state
authorJon Mason <jdmason@kudzu.us>
Wed, 4 Sep 2013 18:26:01 +0000 (11:26 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 5 Sep 2013 18:27:32 +0000 (14:27 -0400)
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>
drivers/net/ethernet/icplus/ipg.c

index 1fde90b96685e878b12ffeee0abc8487845cb4da..bdf5023724e768945f8ec71ceb32a27d897dba6e 100644 (file)
@@ -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);