diff options
Diffstat (limited to 'net/ieee80211/softmac/ieee80211softmac_scan.c')
-rw-r--r-- | net/ieee80211/softmac/ieee80211softmac_scan.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/ieee80211/softmac/ieee80211softmac_scan.c b/net/ieee80211/softmac/ieee80211softmac_scan.c index 0c85d6c24cdb..abea3648680e 100644 --- a/net/ieee80211/softmac/ieee80211softmac_scan.c +++ b/net/ieee80211/softmac/ieee80211softmac_scan.c | |||
@@ -62,12 +62,12 @@ ieee80211softmac_stop_scan(struct ieee80211softmac_device *sm) | |||
62 | unsigned long flags; | 62 | unsigned long flags; |
63 | 63 | ||
64 | spin_lock_irqsave(&sm->lock, flags); | 64 | spin_lock_irqsave(&sm->lock, flags); |
65 | 65 | ||
66 | if (!sm->scanning) { | 66 | if (!sm->scanning) { |
67 | spin_unlock_irqrestore(&sm->lock, flags); | 67 | spin_unlock_irqrestore(&sm->lock, flags); |
68 | return; | 68 | return; |
69 | } | 69 | } |
70 | 70 | ||
71 | spin_unlock_irqrestore(&sm->lock, flags); | 71 | spin_unlock_irqrestore(&sm->lock, flags); |
72 | sm->stop_scan(sm->dev); | 72 | sm->stop_scan(sm->dev); |
73 | } | 73 | } |
@@ -78,12 +78,12 @@ ieee80211softmac_wait_for_scan(struct ieee80211softmac_device *sm) | |||
78 | unsigned long flags; | 78 | unsigned long flags; |
79 | 79 | ||
80 | spin_lock_irqsave(&sm->lock, flags); | 80 | spin_lock_irqsave(&sm->lock, flags); |
81 | 81 | ||
82 | if (!sm->scanning) { | 82 | if (!sm->scanning) { |
83 | spin_unlock_irqrestore(&sm->lock, flags); | 83 | spin_unlock_irqrestore(&sm->lock, flags); |
84 | return; | 84 | return; |
85 | } | 85 | } |
86 | 86 | ||
87 | spin_unlock_irqrestore(&sm->lock, flags); | 87 | spin_unlock_irqrestore(&sm->lock, flags); |
88 | sm->wait_for_scan(sm->dev); | 88 | sm->wait_for_scan(sm->dev); |
89 | } | 89 | } |
@@ -158,14 +158,14 @@ int ieee80211softmac_start_scan_implementation(struct net_device *dev) | |||
158 | { | 158 | { |
159 | struct ieee80211softmac_device *sm = ieee80211_priv(dev); | 159 | struct ieee80211softmac_device *sm = ieee80211_priv(dev); |
160 | unsigned long flags; | 160 | unsigned long flags; |
161 | 161 | ||
162 | if (!(dev->flags & IFF_UP)) | 162 | if (!(dev->flags & IFF_UP)) |
163 | return -ENODEV; | 163 | return -ENODEV; |
164 | 164 | ||
165 | assert(ieee80211softmac_scan_handlers_check_self(sm)); | 165 | assert(ieee80211softmac_scan_handlers_check_self(sm)); |
166 | if (!ieee80211softmac_scan_handlers_check_self(sm)) | 166 | if (!ieee80211softmac_scan_handlers_check_self(sm)) |
167 | return -EINVAL; | 167 | return -EINVAL; |
168 | 168 | ||
169 | spin_lock_irqsave(&sm->lock, flags); | 169 | spin_lock_irqsave(&sm->lock, flags); |
170 | /* it looks like we need to hold the lock here | 170 | /* it looks like we need to hold the lock here |
171 | * to make sure we don't allocate two of these... */ | 171 | * to make sure we don't allocate two of these... */ |
@@ -241,7 +241,7 @@ void ieee80211softmac_scan_finished(struct ieee80211softmac_device *sm) | |||
241 | spin_lock_irqsave(&sm->lock, flags); | 241 | spin_lock_irqsave(&sm->lock, flags); |
242 | sm->scanning = 0; | 242 | sm->scanning = 0; |
243 | spin_unlock_irqrestore(&sm->lock, flags); | 243 | spin_unlock_irqrestore(&sm->lock, flags); |
244 | 244 | ||
245 | if (sm->associnfo.bssvalid) { | 245 | if (sm->associnfo.bssvalid) { |
246 | struct ieee80211softmac_network *net; | 246 | struct ieee80211softmac_network *net; |
247 | 247 | ||