aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-12-07 05:02:40 -0500
committerJeff Garzik <jeff@garzik.org>2006-12-07 05:02:40 -0500
commit359f2d17e32b32f53577375f83fb06d34e31bfe8 (patch)
tree2890ffcf40fab2d2c24d2d208814afeb52bb12e5 /net
parent0efdf2626676db4b30d343ff88f8461ad09130da (diff)
parent720eeb4332e5871c97d390b2fb55a5a74fb18ae6 (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')
-rw-r--r--net/ieee80211/softmac/ieee80211softmac_assoc.c14
-rw-r--r--net/ieee80211/softmac/ieee80211softmac_auth.c2
-rw-r--r--net/ieee80211/softmac/ieee80211softmac_priv.h2
-rw-r--r--net/ieee80211/softmac/ieee80211softmac_wx.c3
4 files changed, 18 insertions, 3 deletions
diff --git a/net/ieee80211/softmac/ieee80211softmac_assoc.c b/net/ieee80211/softmac/ieee80211softmac_assoc.c
index 08386c102954..eec1a1dd91da 100644
--- a/net/ieee80211/softmac/ieee80211softmac_assoc.c
+++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c
@@ -431,6 +431,17 @@ ieee80211softmac_handle_assoc_response(struct net_device * dev,
431 return 0; 431 return 0;
432} 432}
433 433
434void
435ieee80211softmac_try_reassoc(struct ieee80211softmac_device *mac)
436{
437 unsigned long flags;
438
439 spin_lock_irqsave(&mac->lock, flags);
440 mac->associnfo.associating = 1;
441 schedule_work(&mac->associnfo.work);
442 spin_unlock_irqrestore(&mac->lock, flags);
443}
444
434int 445int
435ieee80211softmac_handle_disassoc(struct net_device * dev, 446ieee80211softmac_handle_disassoc(struct net_device * dev,
436 struct ieee80211_disassoc *disassoc) 447 struct ieee80211_disassoc *disassoc)
@@ -449,8 +460,7 @@ ieee80211softmac_handle_disassoc(struct net_device * dev,
449 dprintk(KERN_INFO PFX "got disassoc frame\n"); 460 dprintk(KERN_INFO PFX "got disassoc frame\n");
450 ieee80211softmac_disassoc(mac); 461 ieee80211softmac_disassoc(mac);
451 462
452 /* try to reassociate */ 463 ieee80211softmac_try_reassoc(mac);
453 schedule_delayed_work(&mac->associnfo.work, 0);
454 464
455 return 0; 465 return 0;
456} 466}
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/*
diff --git a/net/ieee80211/softmac/ieee80211softmac_priv.h b/net/ieee80211/softmac/ieee80211softmac_priv.h
index c0dbe070e548..4c2bba34d328 100644
--- a/net/ieee80211/softmac/ieee80211softmac_priv.h
+++ b/net/ieee80211/softmac/ieee80211softmac_priv.h
@@ -239,4 +239,6 @@ void ieee80211softmac_call_events_locked(struct ieee80211softmac_device *mac, in
239int ieee80211softmac_notify_internal(struct ieee80211softmac_device *mac, 239int ieee80211softmac_notify_internal(struct ieee80211softmac_device *mac,
240 int event, void *event_context, notify_function_ptr fun, void *context, gfp_t gfp_mask); 240 int event, void *event_context, notify_function_ptr fun, void *context, gfp_t gfp_mask);
241 241
242void ieee80211softmac_try_reassoc(struct ieee80211softmac_device *mac);
243
242#endif /* IEEE80211SOFTMAC_PRIV_H_ */ 244#endif /* IEEE80211SOFTMAC_PRIV_H_ */
diff --git a/net/ieee80211/softmac/ieee80211softmac_wx.c b/net/ieee80211/softmac/ieee80211softmac_wx.c
index 2ffaebd21c53..480d72c7a42c 100644
--- a/net/ieee80211/softmac/ieee80211softmac_wx.c
+++ b/net/ieee80211/softmac/ieee80211softmac_wx.c
@@ -495,7 +495,8 @@ ieee80211softmac_wx_set_mlme(struct net_device *dev,
495 printk(KERN_DEBUG PFX "wx_set_mlme: we should know the net here...\n"); 495 printk(KERN_DEBUG PFX "wx_set_mlme: we should know the net here...\n");
496 goto out; 496 goto out;
497 } 497 }
498 return ieee80211softmac_deauth_req(mac, net, reason); 498 err = ieee80211softmac_deauth_req(mac, net, reason);
499 goto out;
499 case IW_MLME_DISASSOC: 500 case IW_MLME_DISASSOC:
500 ieee80211softmac_send_disassoc_req(mac, reason); 501 ieee80211softmac_send_disassoc_req(mac, reason);
501 mac->associnfo.associated = 0; 502 mac->associnfo.associated = 0;