aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/ieee80211/softmac/ieee80211softmac_module.c2
-rw-r--r--net/ieee80211/softmac/ieee80211softmac_scan.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/net/ieee80211/softmac/ieee80211softmac_module.c b/net/ieee80211/softmac/ieee80211softmac_module.c
index ea4a19e1122c..a5699966fbc5 100644
--- a/net/ieee80211/softmac/ieee80211softmac_module.c
+++ b/net/ieee80211/softmac/ieee80211softmac_module.c
@@ -77,7 +77,7 @@ ieee80211softmac_clear_pending_work(struct ieee80211softmac_device *sm)
77 spin_unlock_irqrestore(&sm->lock, flags); 77 spin_unlock_irqrestore(&sm->lock, flags);
78 flush_scheduled_work(); 78 flush_scheduled_work();
79 79
80 // now we should be save and no longer need locking... 80 /* now we should be save and no longer need locking... */
81 spin_lock_irqsave(&sm->lock, flags); 81 spin_lock_irqsave(&sm->lock, flags);
82 /* Free all pending auth work items */ 82 /* Free all pending auth work items */
83 list_for_each_entry_safe(authptr, authtmp, &sm->auth_queue, list) { 83 list_for_each_entry_safe(authptr, authtmp, &sm->auth_queue, list) {
diff --git a/net/ieee80211/softmac/ieee80211softmac_scan.c b/net/ieee80211/softmac/ieee80211softmac_scan.c
index 1a1eda434cfd..30e79d45af6b 100644
--- a/net/ieee80211/softmac/ieee80211softmac_scan.c
+++ b/net/ieee80211/softmac/ieee80211softmac_scan.c
@@ -84,7 +84,6 @@ void ieee80211softmac_scan(void *d)
84 84
85 if (!invalid_channel) { 85 if (!invalid_channel) {
86 sm->set_channel(sm->dev, si->channels[current_channel_idx].channel); 86 sm->set_channel(sm->dev, si->channels[current_channel_idx].channel);
87 //TODO: Probe the channel
88 // FIXME make this user configurable (active/passive) 87 // FIXME make this user configurable (active/passive)
89 if(ieee80211softmac_send_mgt_frame(sm, NULL, IEEE80211_STYPE_PROBE_REQ, 0)) 88 if(ieee80211softmac_send_mgt_frame(sm, NULL, IEEE80211_STYPE_PROBE_REQ, 0))
90 printkl(KERN_DEBUG PFX "Sending Probe Request Failed\n"); 89 printkl(KERN_DEBUG PFX "Sending Probe Request Failed\n");