diff options
author | David S. Miller <davem@davemloft.net> | 2008-11-20 04:01:29 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-20 04:01:29 -0800 |
commit | f7f65d1e8bfaa92c1a419c2a52faeca835659295 (patch) | |
tree | b616a113bddb2728fca89ef3062c16b220cee620 /drivers/net/wireless/iwlwifi/iwl3945-base.c | |
parent | eafdcb433f854c8cb06747a80fa3df7c72147be6 (diff) | |
parent | 4018517a1a69a85c3d61b20fa02f187b80773137 (diff) | |
download | op-kernel-dev-f7f65d1e8bfaa92c1a419c2a52faeca835659295.zip op-kernel-dev-f7f65d1e8bfaa92c1a419c2a52faeca835659295.tar.gz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 285b53e..45a6b0c 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c @@ -6012,7 +6012,6 @@ static void iwl3945_bg_alive_start(struct work_struct *data) mutex_lock(&priv->mutex); iwl3945_alive_start(priv); mutex_unlock(&priv->mutex); - ieee80211_notify_mac(priv->hw, IEEE80211_NOTIFY_RE_ASSOC); } static void iwl3945_bg_rf_kill(struct work_struct *work) |