From 76bb2aaafebcae0419d6b43179e1df8c6f9733f4 Mon Sep 17 00:00:00 2001 From: Zhu Yi Date: Thu, 23 Aug 2007 11:31:30 +0800 Subject: [PATCH 21/31] iwlwifi: add a parameter to functions iwl_rate_control_[un]register This parameter is required for rate scaling algorithm selection. Signed-off-by: Zhu Yi --- drivers/net/wireless/iwl-3945-rs.c | 4 ++-- drivers/net/wireless/iwl-3945-rs.h | 8 ++++---- drivers/net/wireless/iwl-4965-rs.c | 4 ++-- drivers/net/wireless/iwl-4965-rs.h | 8 ++++---- drivers/net/wireless/iwl-base.c | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/net/wireless/iwl-3945-rs.c b/drivers/net/wireless/iwl-3945-rs.c index 7e87192..2eee6c5 100644 --- a/drivers/net/wireless/iwl-3945-rs.c +++ b/drivers/net/wireless/iwl-3945-rs.c @@ -971,12 +971,12 @@ void iwl_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id) iwl_rates[rs_priv->start_rate].plcp); } -void iwl_rate_control_register(void) +void iwl_rate_control_register(struct ieee80211_hw *hw) { ieee80211_rate_control_register(&rs_ops); } -void iwl_rate_control_unregister(void) +void iwl_rate_control_unregister(struct ieee80211_hw *hw) { ieee80211_rate_control_unregister(&rs_ops); } diff --git a/drivers/net/wireless/iwl-3945-rs.h b/drivers/net/wireless/iwl-3945-rs.h index 25bdbcb..70dcec4 100644 --- a/drivers/net/wireless/iwl-3945-rs.h +++ b/drivers/net/wireless/iwl-3945-rs.h @@ -200,7 +200,7 @@ extern void iwl_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id); * ieee80211_register_hw * */ -extern void iwl_rate_control_register(void); +extern void iwl_rate_control_register(struct ieee80211_hw *hw); /** * iwl_rate_control_unregister - Unregister the rate control callbacks @@ -208,14 +208,14 @@ extern void iwl_rate_control_register(void); * This should be called after calling ieee80211_unregister_hw, but before * the driver is unloaded. */ -extern void iwl_rate_control_unregister(void); +extern void iwl_rate_control_unregister(struct ieee80211_hw *hw); #else static inline int iwl_fill_rs_info(struct ieee80211_hw *hw, char *buf, u8 sta_id) { return -ENOTSUPP; } static inline void iwl_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id) {} -static inline void iwl_rate_control_register(void) {} -static inline void iwl_rate_control_unregister(void) {} +static inline void iwl_rate_control_register(struct ieee80211_hw *hw) {} +static inline void iwl_rate_control_unregister(struct ieee80211_hw *hw) {} #endif /* IWL == 3945 */ #endif diff --git a/drivers/net/wireless/iwl-4965-rs.c b/drivers/net/wireless/iwl-4965-rs.c index fcff17e..dcda957 100644 --- a/drivers/net/wireless/iwl-4965-rs.c +++ b/drivers/net/wireless/iwl-4965-rs.c @@ -2148,12 +2148,12 @@ void iwl_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id) priv->lq_mngr.lq_ready = 1; } -void iwl_rate_control_register(void) +void iwl_rate_control_register(struct ieee80211_hw *hw) { ieee80211_rate_control_register(&rs_ops); } -void iwl_rate_control_unregister(void) +void iwl_rate_control_unregister(struct ieee80211_hw *hw) { ieee80211_rate_control_unregister(&rs_ops); } diff --git a/drivers/net/wireless/iwl-4965-rs.h b/drivers/net/wireless/iwl-4965-rs.h index b1fb0f0..aa9aae5 100644 --- a/drivers/net/wireless/iwl-4965-rs.h +++ b/drivers/net/wireless/iwl-4965-rs.h @@ -265,7 +265,7 @@ extern void iwl_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id); * ieee80211_register_hw * */ -extern void iwl_rate_control_register(void); +extern void iwl_rate_control_register(struct ieee80211_hw *hw); /** * iwl_rate_control_unregister - Unregister the rate control callbacks @@ -273,14 +273,14 @@ extern void iwl_rate_control_register(void); * This should be called after calling ieee80211_unregister_hw, but before * the driver is unloaded. */ -extern void iwl_rate_control_unregister(void); +extern void iwl_rate_control_unregister(struct ieee80211_hw *hw); #else static inline int iwl_fill_rs_info(struct ieee80211_hw *hw, char *buf, u8 sta_id) { return -ENOTSUPP; } static inline void iwl_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id) {} -static inline void iwl_rate_control_register(void) {} -static inline void iwl_rate_control_unregister(void) {} +static inline void iwl_rate_control_register(struct ieee80211_hw *hw) {} +static inline void iwl_rate_control_unregister(struct ieee80211_hw *hw) {} #endif /* IWL == 4965 */ #endif diff --git a/drivers/net/wireless/iwl-base.c b/drivers/net/wireless/iwl-base.c index d1b8a6e..1728234 100644 --- a/drivers/net/wireless/iwl-base.c +++ b/drivers/net/wireless/iwl-base.c @@ -6744,7 +6744,7 @@ static void iwl_alive_start(struct iwl_priv *priv) /* Unlock so any user space entry points can call back into * the driver without a deadlock... */ mutex_unlock(&priv->mutex); - iwl_rate_control_register(); + iwl_rate_control_register(priv->hw); rc = ieee80211_register_hw(priv->hw); priv->hw->conf.beacon_int = 100; mutex_lock(&priv->mutex); @@ -9443,7 +9443,7 @@ static void iwl_pci_remove(struct pci_dev *pdev) if (priv->mac80211_registered) { ieee80211_unregister_hw(priv->hw); - iwl_rate_control_unregister(); + iwl_rate_control_unregister(priv->hw); } /* ieee80211_unregister_hw calls iwl_mac_stop, which flushes -- 1.5.2