diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-30 23:35:23 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-30 23:35:23 -0700 |
| commit | 19b8cba2e8539e3b8022316f94837d8f242b8f80 (patch) | |
| tree | 9107cfa055ce927a3fdbb706e04ef2481faeb410 /drivers/net/wireless/iwlwifi/iwl-agn.c | |
| parent | 263e69cbc9e5a9e7bcf6a24f641ef0717d1ae4df (diff) | |
| parent | adef199c61a224703dfa95c69d360c793ab2ea97 (diff) | |
| download | blackbird-obmc-linux-19b8cba2e8539e3b8022316f94837d8f242b8f80.tar.gz blackbird-obmc-linux-19b8cba2e8539e3b8022316f94837d8f242b8f80.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 24a1aeb6448f..321dbc8c034a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -2090,7 +2090,6 @@ static void iwl_alive_start(struct iwl_priv *priv) iwl4965_error_recovery(priv); iwl_power_update_mode(priv, 1); - ieee80211_notify_mac(priv->hw, IEEE80211_NOTIFY_RE_ASSOC); if (test_and_clear_bit(STATUS_MODE_PENDING, &priv->status)) iwl4965_set_mode(priv, priv->iw_mode); @@ -2342,6 +2341,7 @@ static void iwl_bg_alive_start(struct work_struct *data) mutex_lock(&priv->mutex); iwl_alive_start(priv); mutex_unlock(&priv->mutex); + ieee80211_notify_mac(priv->hw, IEEE80211_NOTIFY_RE_ASSOC); } static void iwl4965_bg_rf_kill(struct work_struct *work) |
