aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl3945-base.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-10-09 06:18:51 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-10-31 19:00:07 -0400
commite8975581f63870be42ff4662b293d1b0c8c21350 (patch)
tree3d0d67e73d009ea6480b459585c0a70fc35fa9da /drivers/net/wireless/iwlwifi/iwl3945-base.c
parent0f4ac38b5999c3d51adad52d61c56c1b99c247ec (diff)
mac80211: introduce hw config change flags
This makes mac80211 notify the driver which configuration actually changed, e.g. channel etc. No driver changes, this is just plumbing, driver authors are expected to act on this if they want to. Also remove the HW CONFIG debug printk, it's incorrect, often we configure something else. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index d3a2966d9181..b1464c71ea0a 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -6415,7 +6415,7 @@ static void iwl3945_bg_abort_scan(struct work_struct *work)
6415 mutex_unlock(&priv->mutex); 6415 mutex_unlock(&priv->mutex);
6416} 6416}
6417 6417
6418static int iwl3945_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf); 6418static int iwl3945_mac_config(struct ieee80211_hw *hw, u32 changed);
6419 6419
6420static void iwl3945_bg_scan_completed(struct work_struct *work) 6420static void iwl3945_bg_scan_completed(struct work_struct *work)
6421{ 6421{
@@ -6428,7 +6428,7 @@ static void iwl3945_bg_scan_completed(struct work_struct *work)
6428 return; 6428 return;
6429 6429
6430 if (test_bit(STATUS_CONF_PENDING, &priv->status)) 6430 if (test_bit(STATUS_CONF_PENDING, &priv->status))
6431 iwl3945_mac_config(priv->hw, ieee80211_get_hw_conf(priv->hw)); 6431 iwl3945_mac_config(priv->hw, 0);
6432 6432
6433 ieee80211_scan_completed(priv->hw); 6433 ieee80211_scan_completed(priv->hw);
6434 6434
@@ -6616,10 +6616,11 @@ static int iwl3945_mac_add_interface(struct ieee80211_hw *hw,
6616 * be set inappropriately and the driver currently sets the hardware up to 6616 * be set inappropriately and the driver currently sets the hardware up to
6617 * use it whenever needed. 6617 * use it whenever needed.
6618 */ 6618 */
6619static int iwl3945_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf) 6619static int iwl3945_mac_config(struct ieee80211_hw *hw, u32 changed)
6620{ 6620{
6621 struct iwl3945_priv *priv = hw->priv; 6621 struct iwl3945_priv *priv = hw->priv;
6622 const struct iwl3945_channel_info *ch_info; 6622 const struct iwl3945_channel_info *ch_info;
6623 struct ieee80211_conf *conf = &hw->conf;
6623 unsigned long flags; 6624 unsigned long flags;
6624 int ret = 0; 6625 int ret = 0;
6625 6626