diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 16:35:17 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 16:35:17 -0500 |
| commit | 21b4e736922f546e0f1aa7b9d6c442f309a2444a (patch) | |
| tree | e1be8645297f8ebe87445251743ebcc52081a20d /net/ieee80211/softmac/ieee80211softmac_auth.c | |
| parent | 34161db6b14d984fb9b06c735b7b42f8803f6851 (diff) | |
| parent | 68380b581383c028830f79ec2670f4a193854aa6 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
Diffstat (limited to 'net/ieee80211/softmac/ieee80211softmac_auth.c')
| -rw-r--r-- | net/ieee80211/softmac/ieee80211softmac_auth.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ieee80211/softmac/ieee80211softmac_auth.c b/net/ieee80211/softmac/ieee80211softmac_auth.c index 6012705aa4f8..8ed3e59b8024 100644 --- a/net/ieee80211/softmac/ieee80211softmac_auth.c +++ b/net/ieee80211/softmac/ieee80211softmac_auth.c | |||
| @@ -337,6 +337,8 @@ ieee80211softmac_deauth_from_net(struct ieee80211softmac_device *mac, | |||
| 337 | /* can't transmit data right now... */ | 337 | /* can't transmit data right now... */ |
| 338 | netif_carrier_off(mac->dev); | 338 | netif_carrier_off(mac->dev); |
| 339 | spin_unlock_irqrestore(&mac->lock, flags); | 339 | spin_unlock_irqrestore(&mac->lock, flags); |
| 340 | |||
| 341 | ieee80211softmac_try_reassoc(mac); | ||
| 340 | } | 342 | } |
| 341 | 343 | ||
| 342 | /* | 344 | /* |