diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-12-07 05:02:40 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-12-07 05:02:40 -0500 |
| commit | 359f2d17e32b32f53577375f83fb06d34e31bfe8 (patch) | |
| tree | 2890ffcf40fab2d2c24d2d208814afeb52bb12e5 /net/ieee80211/softmac/ieee80211softmac_auth.c | |
| parent | 0efdf2626676db4b30d343ff88f8461ad09130da (diff) | |
| parent | 720eeb4332e5871c97d390b2fb55a5a74fb18ae6 (diff) | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Conflicts:
drivers/net/wireless/zd1211rw/zd_mac.h
net/ieee80211/softmac/ieee80211softmac_assoc.c
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 | /* |