diff options
author | Alexander Duyck <alexander.h.duyck@intel.com> | 2012-05-11 04:32:24 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-07-17 05:46:03 -0400 |
commit | fd13a9abeb8d487e2a3cfd2166542c180d33acc9 (patch) | |
tree | 62f8e431422e79b74836bde7d9f1357a6638fbc9 | |
parent | 77d5dfca41ef00dbe4368ba05297adc32d5e5741 (diff) |
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 <alexander.h.duyck@intel.com>
Acked-by: Greg Rose <gregory.v.rose@intel.com>
Tested-by: Sibai Li <sibai.li@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r-- | drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h index 0cbce49672d..ed19f7e378a 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h +++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | |||
@@ -231,7 +231,6 @@ struct ixgbevf_adapter { | |||
231 | bool link_up; | 231 | bool link_up; |
232 | 232 | ||
233 | struct work_struct watchdog_task; | 233 | struct work_struct watchdog_task; |
234 | bool netdev_registered; | ||
235 | }; | 234 | }; |
236 | 235 | ||
237 | enum ixbgevf_state_t { | 236 | 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 31327711c89..3cd865110a1 100644 --- 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, | |||
3297 | if (err) | 3297 | if (err) |
3298 | goto err_register; | 3298 | goto err_register; |
3299 | 3299 | ||
3300 | adapter->netdev_registered = true; | ||
3301 | |||
3302 | netif_carrier_off(netdev); | 3300 | netif_carrier_off(netdev); |
3303 | 3301 | ||
3304 | ixgbevf_init_last_counter_stats(adapter); | 3302 | ixgbevf_init_last_counter_stats(adapter); |
@@ -3347,10 +3345,8 @@ static void __devexit ixgbevf_remove(struct pci_dev *pdev) | |||
3347 | cancel_work_sync(&adapter->reset_task); | 3345 | cancel_work_sync(&adapter->reset_task); |
3348 | cancel_work_sync(&adapter->watchdog_task); | 3346 | cancel_work_sync(&adapter->watchdog_task); |
3349 | 3347 | ||
3350 | if (adapter->netdev_registered) { | 3348 | if (netdev->reg_state == NETREG_REGISTERED) |
3351 | unregister_netdev(netdev); | 3349 | unregister_netdev(netdev); |
3352 | adapter->netdev_registered = false; | ||
3353 | } | ||
3354 | 3350 | ||
3355 | ixgbevf_reset_interrupt_capability(adapter); | 3351 | ixgbevf_reset_interrupt_capability(adapter); |
3356 | 3352 | ||