From 95d5fe46b8810ba6a44b2455a362d8625591dca1 Mon Sep 17 00:00:00 2001 From: Emmanuel Grumbach Date: Thu, 9 Feb 2012 11:46:06 +0200 Subject: [PATCH] --- yaml --- r: 290744 b: refs/heads/master c: 6459f9871a1218f7a2e6385d1ae6c91e91f9d251 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-agn.c | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-drv.c | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-shared.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 74c9eb8c4bbb..01ccceaa6b7a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 07590f080d5f29e33158b22f7ad6079b85d87609 +refs/heads/master: 6459f9871a1218f7a2e6385d1ae6c91e91f9d251 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c index 8bb97c91b102..09f343cd405e 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -1331,7 +1331,7 @@ int iwl_op_mode_dvm_start(struct iwl_bus *bus, return err; } -void __devexit iwl_remove(struct iwl_priv * priv) +void iwl_op_mode_dvm_stop(struct iwl_priv *priv) { wait_for_completion(&nic(priv)->request_firmware_complete); diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-drv.c b/trunk/drivers/net/wireless/iwlwifi/iwl-drv.c index b3876dec52af..db430c7d27d7 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-drv.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-drv.c @@ -94,7 +94,7 @@ int iwl_drv_start(struct iwl_shared *shrd, void iwl_drv_stop(struct iwl_shared *shrd) { - iwl_remove(shrd->priv); + iwl_op_mode_dvm_stop(shrd->priv); kfree(shrd->nic); } diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h b/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h index d84beef10bdd..392b33a59410 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h @@ -535,7 +535,7 @@ enum iwl_rxon_context_id { int iwl_op_mode_dvm_start(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops, struct iwl_cfg *cfg); -void __devexit iwl_remove(struct iwl_priv * priv); +void iwl_op_mode_dvm_stop(struct iwl_priv *priv); struct iwl_device_cmd; int __must_check iwl_rx_dispatch(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb,