diff options
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-drv.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-shared.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 8bb97c91b102..09f343cd405e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -1331,7 +1331,7 @@ out: | |||
1331 | return err; | 1331 | return err; |
1332 | } | 1332 | } |
1333 | 1333 | ||
1334 | void __devexit iwl_remove(struct iwl_priv * priv) | 1334 | void iwl_op_mode_dvm_stop(struct iwl_priv *priv) |
1335 | { | 1335 | { |
1336 | wait_for_completion(&nic(priv)->request_firmware_complete); | 1336 | wait_for_completion(&nic(priv)->request_firmware_complete); |
1337 | 1337 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c index b3876dec52af..db430c7d27d7 100644 --- a/drivers/net/wireless/iwlwifi/iwl-drv.c +++ b/drivers/net/wireless/iwlwifi/iwl-drv.c | |||
@@ -94,7 +94,7 @@ int iwl_drv_start(struct iwl_shared *shrd, | |||
94 | 94 | ||
95 | void iwl_drv_stop(struct iwl_shared *shrd) | 95 | void iwl_drv_stop(struct iwl_shared *shrd) |
96 | { | 96 | { |
97 | iwl_remove(shrd->priv); | 97 | iwl_op_mode_dvm_stop(shrd->priv); |
98 | 98 | ||
99 | kfree(shrd->nic); | 99 | kfree(shrd->nic); |
100 | } | 100 | } |
diff --git a/drivers/net/wireless/iwlwifi/iwl-shared.h b/drivers/net/wireless/iwlwifi/iwl-shared.h index d84beef10bdd..392b33a59410 100644 --- a/drivers/net/wireless/iwlwifi/iwl-shared.h +++ b/drivers/net/wireless/iwlwifi/iwl-shared.h | |||
@@ -535,7 +535,7 @@ enum iwl_rxon_context_id { | |||
535 | int iwl_op_mode_dvm_start(struct iwl_bus *bus, | 535 | int iwl_op_mode_dvm_start(struct iwl_bus *bus, |
536 | const struct iwl_trans_ops *trans_ops, | 536 | const struct iwl_trans_ops *trans_ops, |
537 | struct iwl_cfg *cfg); | 537 | struct iwl_cfg *cfg); |
538 | void __devexit iwl_remove(struct iwl_priv * priv); | 538 | void iwl_op_mode_dvm_stop(struct iwl_priv *priv); |
539 | struct iwl_device_cmd; | 539 | struct iwl_device_cmd; |
540 | int __must_check iwl_rx_dispatch(struct iwl_priv *priv, | 540 | int __must_check iwl_rx_dispatch(struct iwl_priv *priv, |
541 | struct iwl_rx_mem_buffer *rxb, | 541 | struct iwl_rx_mem_buffer *rxb, |