ixgbevf: Drop netdev_registered value since that is already stored in netdev

There is no need to keep a separate netdev_registered value since that is
already stored in the netdev itself.

Signed-off-by: Alexander Duyck <[email protected]>
Acked-by: Greg Rose <[email protected]>
Tested-by: Sibai Li <[email protected]>
Signed-off-by: Jeff Kirsher <[email protected]>

diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
index 0cbce49672d06966be46d68b13c43773b37f637c..ed19f7e378a23a0d50d442aec14d74d71d5a0228 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
@@ -231,7 +231,6 @@ struct ixgbevf_adapter {
        bool link_up;
 
        struct work_struct watchdog_task;
-       bool netdev_registered;
 };
 
 enum ixbgevf_state_t {

diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 31327711c89e9721fe3d3d175c95a9721ef925ec..3cd865110a1aa72cb23c4d1ea47ce3b045d0907e 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -3297,8 +3297,6 @@ static int __devinit ixgbevf_probe(struct pci_dev *pdev,
        if (err)
                goto err_register;
 
-       adapter->netdev_registered = true;
-
        netif_carrier_off(netdev);
 
        ixgbevf_init_last_counter_stats(adapter);
@@ -3347,10 +3345,8 @@ static void __devexit ixgbevf_remove(struct pci_dev *pdev)
        cancel_work_sync(&adapter->reset_task);
        cancel_work_sync(&adapter->watchdog_task);
 
-       if (adapter->netdev_registered) {
+       if (netdev->reg_state == NETREG_REGISTERED)
                unregister_netdev(netdev);
-               adapter->netdev_registered = false;
-       }
 
        ixgbevf_reset_interrupt_capability(adapter);