Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit efe117ab8114f47f317b4803e5bc0104420bcba2

Authored by Eric Dumazet
Committed by John W. Linville
1 parent 4ba3eb034f
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

mac80211: Speedup ieee80211_remove_interfaces() 

Speedup ieee80211_remove_interfaces() by factorizing synchronize_rcu() calls

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Reviewed-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

Showing 1 changed file with 5 additions and 9 deletions Inline Diff

net/mac80211/iface.c
Diff comments   View file @ efe117a
1 /* 1 /*
2 * Interface handling (except master interface) 2 * Interface handling (except master interface)
3 * 3 *
4 * Copyright 2002-2005, Instant802 Networks, Inc. 4 * Copyright 2002-2005, Instant802 Networks, Inc.
5 * Copyright 2005-2006, Devicescape Software, Inc. 5 * Copyright 2005-2006, Devicescape Software, Inc.
6 * Copyright (c) 2006 Jiri Benc <jbenc@suse.cz> 6 * Copyright (c) 2006 Jiri Benc <jbenc@suse.cz>
7 * Copyright 2008, Johannes Berg <johannes@sipsolutions.net> 7 * Copyright 2008, Johannes Berg <johannes@sipsolutions.net>
8 * 8 *
9 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License version 2 as 10 * it under the terms of the GNU General Public License version 2 as
11 * published by the Free Software Foundation. 11 * published by the Free Software Foundation.
12 */ 12 */
13 #include <linux/kernel.h> 13 #include <linux/kernel.h>
14 #include <linux/if_arp.h> 14 #include <linux/if_arp.h>
15 #include <linux/netdevice.h> 15 #include <linux/netdevice.h>
16 #include <linux/rtnetlink.h> 16 #include <linux/rtnetlink.h>
17 #include <net/mac80211.h> 17 #include <net/mac80211.h>
18 #include "ieee80211_i.h" 18 #include "ieee80211_i.h"
19 #include "sta_info.h" 19 #include "sta_info.h"
20 #include "debugfs_netdev.h" 20 #include "debugfs_netdev.h"
21 #include "mesh.h" 21 #include "mesh.h"
22 #include "led.h" 22 #include "led.h"
23 #include "driver-ops.h" 23 #include "driver-ops.h"
24 24
25 /** 25 /**
26 * DOC: Interface list locking 26 * DOC: Interface list locking
27 * 27 *
28 * The interface list in each struct ieee80211_local is protected 28 * The interface list in each struct ieee80211_local is protected
29 * three-fold: 29 * three-fold:
30 * 30 *
31 * (1) modifications may only be done under the RTNL 31 * (1) modifications may only be done under the RTNL
32 * (2) modifications and readers are protected against each other by 32 * (2) modifications and readers are protected against each other by
33 * the iflist_mtx. 33 * the iflist_mtx.
34 * (3) modifications are done in an RCU manner so atomic readers 34 * (3) modifications are done in an RCU manner so atomic readers
35 * can traverse the list in RCU-safe blocks. 35 * can traverse the list in RCU-safe blocks.
36 * 36 *
37 * As a consequence, reads (traversals) of the list can be protected 37 * As a consequence, reads (traversals) of the list can be protected
38 * by either the RTNL, the iflist_mtx or RCU. 38 * by either the RTNL, the iflist_mtx or RCU.
39 */ 39 */
40 40
41 41
42 static int ieee80211_change_mtu(struct net_device *dev, int new_mtu) 42 static int ieee80211_change_mtu(struct net_device *dev, int new_mtu)
43 { 43 {
44 int meshhdrlen; 44 int meshhdrlen;
45 struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); 45 struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
46 46
47 meshhdrlen = (sdata->vif.type == NL80211_IFTYPE_MESH_POINT) ? 5 : 0; 47 meshhdrlen = (sdata->vif.type == NL80211_IFTYPE_MESH_POINT) ? 5 : 0;
48 48
49 /* FIX: what would be proper limits for MTU? 49 /* FIX: what would be proper limits for MTU?
50 * This interface uses 802.3 frames. */ 50 * This interface uses 802.3 frames. */
51 if (new_mtu < 256 || 51 if (new_mtu < 256 ||
52 new_mtu > IEEE80211_MAX_DATA_LEN - 24 - 6 - meshhdrlen) { 52 new_mtu > IEEE80211_MAX_DATA_LEN - 24 - 6 - meshhdrlen) {
53 return -EINVAL; 53 return -EINVAL;
54 } 54 }
55 55
56 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG 56 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
57 printk(KERN_DEBUG "%s: setting MTU %d\n", dev->name, new_mtu); 57 printk(KERN_DEBUG "%s: setting MTU %d\n", dev->name, new_mtu);
58 #endif /* CONFIG_MAC80211_VERBOSE_DEBUG */ 58 #endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
59 dev->mtu = new_mtu; 59 dev->mtu = new_mtu;
60 return 0; 60 return 0;
61 } 61 }
62 62
63 static inline int identical_mac_addr_allowed(int type1, int type2) 63 static inline int identical_mac_addr_allowed(int type1, int type2)
64 { 64 {
65 return type1 == NL80211_IFTYPE_MONITOR || 65 return type1 == NL80211_IFTYPE_MONITOR ||
66 type2 == NL80211_IFTYPE_MONITOR || 66 type2 == NL80211_IFTYPE_MONITOR ||
67 (type1 == NL80211_IFTYPE_AP && type2 == NL80211_IFTYPE_WDS) || 67 (type1 == NL80211_IFTYPE_AP && type2 == NL80211_IFTYPE_WDS) ||
68 (type1 == NL80211_IFTYPE_WDS && 68 (type1 == NL80211_IFTYPE_WDS &&
69 (type2 == NL80211_IFTYPE_WDS || 69 (type2 == NL80211_IFTYPE_WDS ||
70 type2 == NL80211_IFTYPE_AP)) || 70 type2 == NL80211_IFTYPE_AP)) ||
71 (type1 == NL80211_IFTYPE_AP && type2 == NL80211_IFTYPE_AP_VLAN) || 71 (type1 == NL80211_IFTYPE_AP && type2 == NL80211_IFTYPE_AP_VLAN) ||
72 (type1 == NL80211_IFTYPE_AP_VLAN && 72 (type1 == NL80211_IFTYPE_AP_VLAN &&
73 (type2 == NL80211_IFTYPE_AP || 73 (type2 == NL80211_IFTYPE_AP ||
74 type2 == NL80211_IFTYPE_AP_VLAN)); 74 type2 == NL80211_IFTYPE_AP_VLAN));
75 } 75 }
76 76
77 static int ieee80211_open(struct net_device *dev) 77 static int ieee80211_open(struct net_device *dev)
78 { 78 {
79 struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); 79 struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
80 struct ieee80211_sub_if_data *nsdata; 80 struct ieee80211_sub_if_data *nsdata;
81 struct ieee80211_local *local = sdata->local; 81 struct ieee80211_local *local = sdata->local;
82 struct sta_info *sta; 82 struct sta_info *sta;
83 struct ieee80211_if_init_conf conf; 83 struct ieee80211_if_init_conf conf;
84 u32 changed = 0; 84 u32 changed = 0;
85 int res; 85 int res;
86 u32 hw_reconf_flags = 0; 86 u32 hw_reconf_flags = 0;
87 u8 null_addr[ETH_ALEN] = {0}; 87 u8 null_addr[ETH_ALEN] = {0};
88 88
89 /* fail early if user set an invalid address */ 89 /* fail early if user set an invalid address */
90 if (compare_ether_addr(dev->dev_addr, null_addr) && 90 if (compare_ether_addr(dev->dev_addr, null_addr) &&
91 !is_valid_ether_addr(dev->dev_addr)) 91 !is_valid_ether_addr(dev->dev_addr))
92 return -EADDRNOTAVAIL; 92 return -EADDRNOTAVAIL;
93 93
94 /* we hold the RTNL here so can safely walk the list */ 94 /* we hold the RTNL here so can safely walk the list */
95 list_for_each_entry(nsdata, &local->interfaces, list) { 95 list_for_each_entry(nsdata, &local->interfaces, list) {
96 struct net_device *ndev = nsdata->dev; 96 struct net_device *ndev = nsdata->dev;
97 97
98 if (ndev != dev && netif_running(ndev)) { 98 if (ndev != dev && netif_running(ndev)) {
99 /* 99 /*
100 * Allow only a single IBSS interface to be up at any 100 * Allow only a single IBSS interface to be up at any
101 * time. This is restricted because beacon distribution 101 * time. This is restricted because beacon distribution
102 * cannot work properly if both are in the same IBSS. 102 * cannot work properly if both are in the same IBSS.
103 * 103 *
104 * To remove this restriction we'd have to disallow them 104 * To remove this restriction we'd have to disallow them
105 * from setting the same SSID on different IBSS interfaces 105 * from setting the same SSID on different IBSS interfaces
106 * belonging to the same hardware. Then, however, we're 106 * belonging to the same hardware. Then, however, we're
107 * faced with having to adopt two different TSF timers... 107 * faced with having to adopt two different TSF timers...
108 */ 108 */
109 if (sdata->vif.type == NL80211_IFTYPE_ADHOC && 109 if (sdata->vif.type == NL80211_IFTYPE_ADHOC &&
110 nsdata->vif.type == NL80211_IFTYPE_ADHOC) 110 nsdata->vif.type == NL80211_IFTYPE_ADHOC)
111 return -EBUSY; 111 return -EBUSY;
112 112
113 /* 113 /*
114 * The remaining checks are only performed for interfaces 114 * The remaining checks are only performed for interfaces
115 * with the same MAC address. 115 * with the same MAC address.
116 */ 116 */
117 if (compare_ether_addr(dev->dev_addr, ndev->dev_addr)) 117 if (compare_ether_addr(dev->dev_addr, ndev->dev_addr))
118 continue; 118 continue;
119 119
120 /* 120 /*
121 * check whether it may have the same address 121 * check whether it may have the same address
122 */ 122 */
123 if (!identical_mac_addr_allowed(sdata->vif.type, 123 if (!identical_mac_addr_allowed(sdata->vif.type,
124 nsdata->vif.type)) 124 nsdata->vif.type))
125 return -ENOTUNIQ; 125 return -ENOTUNIQ;
126 126
127 /* 127 /*
128 * can only add VLANs to enabled APs 128 * can only add VLANs to enabled APs
129 */ 129 */
130 if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN && 130 if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN &&
131 nsdata->vif.type == NL80211_IFTYPE_AP) 131 nsdata->vif.type == NL80211_IFTYPE_AP)
132 sdata->bss = &nsdata->u.ap; 132 sdata->bss = &nsdata->u.ap;
133 } 133 }
134 } 134 }
135 135
136 switch (sdata->vif.type) { 136 switch (sdata->vif.type) {
137 case NL80211_IFTYPE_WDS: 137 case NL80211_IFTYPE_WDS:
138 if (!is_valid_ether_addr(sdata->u.wds.remote_addr)) 138 if (!is_valid_ether_addr(sdata->u.wds.remote_addr))
139 return -ENOLINK; 139 return -ENOLINK;
140 break; 140 break;
141 case NL80211_IFTYPE_AP_VLAN: 141 case NL80211_IFTYPE_AP_VLAN:
142 if (!sdata->bss) 142 if (!sdata->bss)
143 return -ENOLINK; 143 return -ENOLINK;
144 list_add(&sdata->u.vlan.list, &sdata->bss->vlans); 144 list_add(&sdata->u.vlan.list, &sdata->bss->vlans);
145 break; 145 break;
146 case NL80211_IFTYPE_AP: 146 case NL80211_IFTYPE_AP:
147 sdata->bss = &sdata->u.ap; 147 sdata->bss = &sdata->u.ap;
148 break; 148 break;
149 case NL80211_IFTYPE_MESH_POINT: 149 case NL80211_IFTYPE_MESH_POINT:
150 if (!ieee80211_vif_is_mesh(&sdata->vif)) 150 if (!ieee80211_vif_is_mesh(&sdata->vif))
151 break; 151 break;
152 /* mesh ifaces must set allmulti to forward mcast traffic */ 152 /* mesh ifaces must set allmulti to forward mcast traffic */
153 atomic_inc(&local->iff_allmultis); 153 atomic_inc(&local->iff_allmultis);
154 break; 154 break;
155 case NL80211_IFTYPE_STATION: 155 case NL80211_IFTYPE_STATION:
156 case NL80211_IFTYPE_MONITOR: 156 case NL80211_IFTYPE_MONITOR:
157 case NL80211_IFTYPE_ADHOC: 157 case NL80211_IFTYPE_ADHOC:
158 /* no special treatment */ 158 /* no special treatment */
159 break; 159 break;
160 case NL80211_IFTYPE_UNSPECIFIED: 160 case NL80211_IFTYPE_UNSPECIFIED:
161 case __NL80211_IFTYPE_AFTER_LAST: 161 case __NL80211_IFTYPE_AFTER_LAST:
162 /* cannot happen */ 162 /* cannot happen */
163 WARN_ON(1); 163 WARN_ON(1);
164 break; 164 break;
165 } 165 }
166 166
167 if (local->open_count == 0) { 167 if (local->open_count == 0) {
168 res = drv_start(local); 168 res = drv_start(local);
169 if (res) 169 if (res)
170 goto err_del_bss; 170 goto err_del_bss;
171 /* we're brought up, everything changes */ 171 /* we're brought up, everything changes */
172 hw_reconf_flags = ~0; 172 hw_reconf_flags = ~0;
173 ieee80211_led_radio(local, true); 173 ieee80211_led_radio(local, true);
174 } 174 }
175 175
176 /* 176 /*
177 * Check all interfaces and copy the hopefully now-present 177 * Check all interfaces and copy the hopefully now-present
178 * MAC address to those that have the special null one. 178 * MAC address to those that have the special null one.
179 */ 179 */
180 list_for_each_entry(nsdata, &local->interfaces, list) { 180 list_for_each_entry(nsdata, &local->interfaces, list) {
181 struct net_device *ndev = nsdata->dev; 181 struct net_device *ndev = nsdata->dev;
182 182
183 /* 183 /*
184 * No need to check netif_running since we do not allow 184 * No need to check netif_running since we do not allow
185 * it to start up with this invalid address. 185 * it to start up with this invalid address.
186 */ 186 */
187 if (compare_ether_addr(null_addr, ndev->dev_addr) == 0) { 187 if (compare_ether_addr(null_addr, ndev->dev_addr) == 0) {
188 memcpy(ndev->dev_addr, 188 memcpy(ndev->dev_addr,
189 local->hw.wiphy->perm_addr, 189 local->hw.wiphy->perm_addr,
190 ETH_ALEN); 190 ETH_ALEN);
191 memcpy(ndev->perm_addr, ndev->dev_addr, ETH_ALEN); 191 memcpy(ndev->perm_addr, ndev->dev_addr, ETH_ALEN);
192 } 192 }
193 } 193 }
194 194
195 /* 195 /*
196 * Validate the MAC address for this device. 196 * Validate the MAC address for this device.
197 */ 197 */
198 if (!is_valid_ether_addr(dev->dev_addr)) { 198 if (!is_valid_ether_addr(dev->dev_addr)) {
199 if (!local->open_count) 199 if (!local->open_count)
200 drv_stop(local); 200 drv_stop(local);
201 return -EADDRNOTAVAIL; 201 return -EADDRNOTAVAIL;
202 } 202 }
203 203
204 switch (sdata->vif.type) { 204 switch (sdata->vif.type) {
205 case NL80211_IFTYPE_AP_VLAN: 205 case NL80211_IFTYPE_AP_VLAN:
206 /* no need to tell driver */ 206 /* no need to tell driver */
207 break; 207 break;
208 case NL80211_IFTYPE_MONITOR: 208 case NL80211_IFTYPE_MONITOR:
209 if (sdata->u.mntr_flags & MONITOR_FLAG_COOK_FRAMES) { 209 if (sdata->u.mntr_flags & MONITOR_FLAG_COOK_FRAMES) {
210 local->cooked_mntrs++; 210 local->cooked_mntrs++;
211 break; 211 break;
212 } 212 }
213 213
214 /* must be before the call to ieee80211_configure_filter */ 214 /* must be before the call to ieee80211_configure_filter */
215 local->monitors++; 215 local->monitors++;
216 if (local->monitors == 1) { 216 if (local->monitors == 1) {
217 local->hw.conf.flags |= IEEE80211_CONF_MONITOR; 217 local->hw.conf.flags |= IEEE80211_CONF_MONITOR;
218 hw_reconf_flags |= IEEE80211_CONF_CHANGE_MONITOR; 218 hw_reconf_flags |= IEEE80211_CONF_CHANGE_MONITOR;
219 } 219 }
220 220
221 if (sdata->u.mntr_flags & MONITOR_FLAG_FCSFAIL) 221 if (sdata->u.mntr_flags & MONITOR_FLAG_FCSFAIL)
222 local->fif_fcsfail++; 222 local->fif_fcsfail++;
223 if (sdata->u.mntr_flags & MONITOR_FLAG_PLCPFAIL) 223 if (sdata->u.mntr_flags & MONITOR_FLAG_PLCPFAIL)
224 local->fif_plcpfail++; 224 local->fif_plcpfail++;
225 if (sdata->u.mntr_flags & MONITOR_FLAG_CONTROL) { 225 if (sdata->u.mntr_flags & MONITOR_FLAG_CONTROL) {
226 local->fif_control++; 226 local->fif_control++;
227 local->fif_pspoll++; 227 local->fif_pspoll++;
228 } 228 }
229 if (sdata->u.mntr_flags & MONITOR_FLAG_OTHER_BSS) 229 if (sdata->u.mntr_flags & MONITOR_FLAG_OTHER_BSS)
230 local->fif_other_bss++; 230 local->fif_other_bss++;
231 231
232 ieee80211_configure_filter(local); 232 ieee80211_configure_filter(local);
233 break; 233 break;
234 default: 234 default:
235 conf.vif = &sdata->vif; 235 conf.vif = &sdata->vif;
236 conf.type = sdata->vif.type; 236 conf.type = sdata->vif.type;
237 conf.mac_addr = dev->dev_addr; 237 conf.mac_addr = dev->dev_addr;
238 res = drv_add_interface(local, &conf); 238 res = drv_add_interface(local, &conf);
239 if (res) 239 if (res)
240 goto err_stop; 240 goto err_stop;
241 241
242 if (ieee80211_vif_is_mesh(&sdata->vif)) { 242 if (ieee80211_vif_is_mesh(&sdata->vif)) {
243 local->fif_other_bss++; 243 local->fif_other_bss++;
244 ieee80211_configure_filter(local); 244 ieee80211_configure_filter(local);
245 245
246 ieee80211_start_mesh(sdata); 246 ieee80211_start_mesh(sdata);
247 } else if (sdata->vif.type == NL80211_IFTYPE_AP) { 247 } else if (sdata->vif.type == NL80211_IFTYPE_AP) {
248 local->fif_pspoll++; 248 local->fif_pspoll++;
249 249
250 ieee80211_configure_filter(local); 250 ieee80211_configure_filter(local);
251 } 251 }
252 252
253 changed |= ieee80211_reset_erp_info(sdata); 253 changed |= ieee80211_reset_erp_info(sdata);
254 ieee80211_bss_info_change_notify(sdata, changed); 254 ieee80211_bss_info_change_notify(sdata, changed);
255 ieee80211_enable_keys(sdata); 255 ieee80211_enable_keys(sdata);
256 256
257 if (sdata->vif.type == NL80211_IFTYPE_STATION) 257 if (sdata->vif.type == NL80211_IFTYPE_STATION)
258 netif_carrier_off(dev); 258 netif_carrier_off(dev);
259 else 259 else
260 netif_carrier_on(dev); 260 netif_carrier_on(dev);
261 } 261 }
262 262
263 if (sdata->vif.type == NL80211_IFTYPE_WDS) { 263 if (sdata->vif.type == NL80211_IFTYPE_WDS) {
264 /* Create STA entry for the WDS peer */ 264 /* Create STA entry for the WDS peer */
265 sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr, 265 sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr,
266 GFP_KERNEL); 266 GFP_KERNEL);
267 if (!sta) { 267 if (!sta) {
268 res = -ENOMEM; 268 res = -ENOMEM;
269 goto err_del_interface; 269 goto err_del_interface;
270 } 270 }
271 271
272 /* no locking required since STA is not live yet */ 272 /* no locking required since STA is not live yet */
273 sta->flags |= WLAN_STA_AUTHORIZED; 273 sta->flags |= WLAN_STA_AUTHORIZED;
274 274
275 res = sta_info_insert(sta); 275 res = sta_info_insert(sta);
276 if (res) { 276 if (res) {
277 /* STA has been freed */ 277 /* STA has been freed */
278 goto err_del_interface; 278 goto err_del_interface;
279 } 279 }
280 } 280 }
281 281
282 /* 282 /*
283 * set_multicast_list will be invoked by the networking core 283 * set_multicast_list will be invoked by the networking core
284 * which will check whether any increments here were done in 284 * which will check whether any increments here were done in
285 * error and sync them down to the hardware as filter flags. 285 * error and sync them down to the hardware as filter flags.
286 */ 286 */
287 if (sdata->flags & IEEE80211_SDATA_ALLMULTI) 287 if (sdata->flags & IEEE80211_SDATA_ALLMULTI)
288 atomic_inc(&local->iff_allmultis); 288 atomic_inc(&local->iff_allmultis);
289 289
290 if (sdata->flags & IEEE80211_SDATA_PROMISC) 290 if (sdata->flags & IEEE80211_SDATA_PROMISC)
291 atomic_inc(&local->iff_promiscs); 291 atomic_inc(&local->iff_promiscs);
292 292
293 hw_reconf_flags |= __ieee80211_recalc_idle(local); 293 hw_reconf_flags |= __ieee80211_recalc_idle(local);
294 294
295 local->open_count++; 295 local->open_count++;
296 if (hw_reconf_flags) { 296 if (hw_reconf_flags) {
297 ieee80211_hw_config(local, hw_reconf_flags); 297 ieee80211_hw_config(local, hw_reconf_flags);
298 /* 298 /*
299 * set default queue parameters so drivers don't 299 * set default queue parameters so drivers don't
300 * need to initialise the hardware if the hardware 300 * need to initialise the hardware if the hardware
301 * doesn't start up with sane defaults 301 * doesn't start up with sane defaults
302 */ 302 */
303 ieee80211_set_wmm_default(sdata); 303 ieee80211_set_wmm_default(sdata);
304 } 304 }
305 305
306 ieee80211_recalc_ps(local, -1); 306 ieee80211_recalc_ps(local, -1);
307 307
308 /* 308 /*
309 * ieee80211_sta_work is disabled while network interface 309 * ieee80211_sta_work is disabled while network interface
310 * is down. Therefore, some configuration changes may not 310 * is down. Therefore, some configuration changes may not
311 * yet be effective. Trigger execution of ieee80211_sta_work 311 * yet be effective. Trigger execution of ieee80211_sta_work
312 * to fix this. 312 * to fix this.
313 */ 313 */
314 if (sdata->vif.type == NL80211_IFTYPE_STATION) 314 if (sdata->vif.type == NL80211_IFTYPE_STATION)
315 ieee80211_queue_work(&local->hw, &sdata->u.mgd.work); 315 ieee80211_queue_work(&local->hw, &sdata->u.mgd.work);
316 316
317 netif_start_queue(dev); 317 netif_start_queue(dev);
318 318
319 return 0; 319 return 0;
320 err_del_interface: 320 err_del_interface:
321 drv_remove_interface(local, &conf); 321 drv_remove_interface(local, &conf);
322 err_stop: 322 err_stop:
323 if (!local->open_count) 323 if (!local->open_count)
324 drv_stop(local); 324 drv_stop(local);
325 err_del_bss: 325 err_del_bss:
326 sdata->bss = NULL; 326 sdata->bss = NULL;
327 if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) 327 if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
328 list_del(&sdata->u.vlan.list); 328 list_del(&sdata->u.vlan.list);
329 return res; 329 return res;
330 } 330 }
331 331
332 static int ieee80211_stop(struct net_device *dev) 332 static int ieee80211_stop(struct net_device *dev)
333 { 333 {
334 struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); 334 struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
335 struct ieee80211_local *local = sdata->local; 335 struct ieee80211_local *local = sdata->local;
336 struct ieee80211_if_init_conf conf; 336 struct ieee80211_if_init_conf conf;
337 struct sta_info *sta; 337 struct sta_info *sta;
338 unsigned long flags; 338 unsigned long flags;
339 struct sk_buff *skb, *tmp; 339 struct sk_buff *skb, *tmp;
340 u32 hw_reconf_flags = 0; 340 u32 hw_reconf_flags = 0;
341 int i; 341 int i;
342 342
343 /* 343 /*
344 * Stop TX on this interface first. 344 * Stop TX on this interface first.
345 */ 345 */
346 netif_stop_queue(dev); 346 netif_stop_queue(dev);
347 347
348 /* 348 /*
349 * Now delete all active aggregation sessions. 349 * Now delete all active aggregation sessions.
350 */ 350 */
351 rcu_read_lock(); 351 rcu_read_lock();
352 352
353 list_for_each_entry_rcu(sta, &local->sta_list, list) { 353 list_for_each_entry_rcu(sta, &local->sta_list, list) {
354 if (sta->sdata == sdata) 354 if (sta->sdata == sdata)
355 ieee80211_sta_tear_down_BA_sessions(sta); 355 ieee80211_sta_tear_down_BA_sessions(sta);
356 } 356 }
357 357
358 rcu_read_unlock(); 358 rcu_read_unlock();
359 359
360 /* 360 /*
361 * Remove all stations associated with this interface. 361 * Remove all stations associated with this interface.
362 * 362 *
363 * This must be done before calling ops->remove_interface() 363 * This must be done before calling ops->remove_interface()
364 * because otherwise we can later invoke ops->sta_notify() 364 * because otherwise we can later invoke ops->sta_notify()
365 * whenever the STAs are removed, and that invalidates driver 365 * whenever the STAs are removed, and that invalidates driver
366 * assumptions about always getting a vif pointer that is valid 366 * assumptions about always getting a vif pointer that is valid
367 * (because if we remove a STA after ops->remove_interface() 367 * (because if we remove a STA after ops->remove_interface()
368 * the driver will have removed the vif info already!) 368 * the driver will have removed the vif info already!)
369 * 369 *
370 * We could relax this and only unlink the stations from the 370 * We could relax this and only unlink the stations from the
371 * hash table and list but keep them on a per-sdata list that 371 * hash table and list but keep them on a per-sdata list that
372 * will be inserted back again when the interface is brought 372 * will be inserted back again when the interface is brought
373 * up again, but I don't currently see a use case for that, 373 * up again, but I don't currently see a use case for that,
374 * except with WDS which gets a STA entry created when it is 374 * except with WDS which gets a STA entry created when it is
375 * brought up. 375 * brought up.
376 */ 376 */
377 sta_info_flush(local, sdata); 377 sta_info_flush(local, sdata);
378 378
379 /* 379 /*
380 * Don't count this interface for promisc/allmulti while it 380 * Don't count this interface for promisc/allmulti while it
381 * is down. dev_mc_unsync() will invoke set_multicast_list 381 * is down. dev_mc_unsync() will invoke set_multicast_list
382 * on the master interface which will sync these down to the 382 * on the master interface which will sync these down to the
383 * hardware as filter flags. 383 * hardware as filter flags.
384 */ 384 */
385 if (sdata->flags & IEEE80211_SDATA_ALLMULTI) 385 if (sdata->flags & IEEE80211_SDATA_ALLMULTI)
386 atomic_dec(&local->iff_allmultis); 386 atomic_dec(&local->iff_allmultis);
387 387
388 if (sdata->flags & IEEE80211_SDATA_PROMISC) 388 if (sdata->flags & IEEE80211_SDATA_PROMISC)
389 atomic_dec(&local->iff_promiscs); 389 atomic_dec(&local->iff_promiscs);
390 390
391 if (sdata->vif.type == NL80211_IFTYPE_AP) 391 if (sdata->vif.type == NL80211_IFTYPE_AP)
392 local->fif_pspoll--; 392 local->fif_pspoll--;
393 393
394 netif_addr_lock_bh(dev); 394 netif_addr_lock_bh(dev);
395 spin_lock_bh(&local->filter_lock); 395 spin_lock_bh(&local->filter_lock);
396 __dev_addr_unsync(&local->mc_list, &local->mc_count, 396 __dev_addr_unsync(&local->mc_list, &local->mc_count,
397 &dev->mc_list, &dev->mc_count); 397 &dev->mc_list, &dev->mc_count);
398 spin_unlock_bh(&local->filter_lock); 398 spin_unlock_bh(&local->filter_lock);
399 netif_addr_unlock_bh(dev); 399 netif_addr_unlock_bh(dev);
400 400
401 ieee80211_configure_filter(local); 401 ieee80211_configure_filter(local);
402 402
403 del_timer_sync(&local->dynamic_ps_timer); 403 del_timer_sync(&local->dynamic_ps_timer);
404 cancel_work_sync(&local->dynamic_ps_enable_work); 404 cancel_work_sync(&local->dynamic_ps_enable_work);
405 405
406 /* APs need special treatment */ 406 /* APs need special treatment */
407 if (sdata->vif.type == NL80211_IFTYPE_AP) { 407 if (sdata->vif.type == NL80211_IFTYPE_AP) {
408 struct ieee80211_sub_if_data *vlan, *tmpsdata; 408 struct ieee80211_sub_if_data *vlan, *tmpsdata;
409 struct beacon_data *old_beacon = sdata->u.ap.beacon; 409 struct beacon_data *old_beacon = sdata->u.ap.beacon;
410 410
411 /* remove beacon */ 411 /* remove beacon */
412 rcu_assign_pointer(sdata->u.ap.beacon, NULL); 412 rcu_assign_pointer(sdata->u.ap.beacon, NULL);
413 synchronize_rcu(); 413 synchronize_rcu();
414 kfree(old_beacon); 414 kfree(old_beacon);
415 415
416 /* down all dependent devices, that is VLANs */ 416 /* down all dependent devices, that is VLANs */
417 list_for_each_entry_safe(vlan, tmpsdata, &sdata->u.ap.vlans, 417 list_for_each_entry_safe(vlan, tmpsdata, &sdata->u.ap.vlans,
418 u.vlan.list) 418 u.vlan.list)
419 dev_close(vlan->dev); 419 dev_close(vlan->dev);
420 WARN_ON(!list_empty(&sdata->u.ap.vlans)); 420 WARN_ON(!list_empty(&sdata->u.ap.vlans));
421 } 421 }
422 422
423 local->open_count--; 423 local->open_count--;
424 424
425 switch (sdata->vif.type) { 425 switch (sdata->vif.type) {
426 case NL80211_IFTYPE_AP_VLAN: 426 case NL80211_IFTYPE_AP_VLAN:
427 list_del(&sdata->u.vlan.list); 427 list_del(&sdata->u.vlan.list);
428 /* no need to tell driver */ 428 /* no need to tell driver */
429 break; 429 break;
430 case NL80211_IFTYPE_MONITOR: 430 case NL80211_IFTYPE_MONITOR:
431 if (sdata->u.mntr_flags & MONITOR_FLAG_COOK_FRAMES) { 431 if (sdata->u.mntr_flags & MONITOR_FLAG_COOK_FRAMES) {
432 local->cooked_mntrs--; 432 local->cooked_mntrs--;
433 break; 433 break;
434 } 434 }
435 435
436 local->monitors--; 436 local->monitors--;
437 if (local->monitors == 0) { 437 if (local->monitors == 0) {
438 local->hw.conf.flags &= ~IEEE80211_CONF_MONITOR; 438 local->hw.conf.flags &= ~IEEE80211_CONF_MONITOR;
439 hw_reconf_flags |= IEEE80211_CONF_CHANGE_MONITOR; 439 hw_reconf_flags |= IEEE80211_CONF_CHANGE_MONITOR;
440 } 440 }
441 441
442 if (sdata->u.mntr_flags & MONITOR_FLAG_FCSFAIL) 442 if (sdata->u.mntr_flags & MONITOR_FLAG_FCSFAIL)
443 local->fif_fcsfail--; 443 local->fif_fcsfail--;
444 if (sdata->u.mntr_flags & MONITOR_FLAG_PLCPFAIL) 444 if (sdata->u.mntr_flags & MONITOR_FLAG_PLCPFAIL)
445 local->fif_plcpfail--; 445 local->fif_plcpfail--;
446 if (sdata->u.mntr_flags & MONITOR_FLAG_CONTROL) { 446 if (sdata->u.mntr_flags & MONITOR_FLAG_CONTROL) {
447 local->fif_pspoll--; 447 local->fif_pspoll--;
448 local->fif_control--; 448 local->fif_control--;
449 } 449 }
450 if (sdata->u.mntr_flags & MONITOR_FLAG_OTHER_BSS) 450 if (sdata->u.mntr_flags & MONITOR_FLAG_OTHER_BSS)
451 local->fif_other_bss--; 451 local->fif_other_bss--;
452 452
453 ieee80211_configure_filter(local); 453 ieee80211_configure_filter(local);
454 break; 454 break;
455 case NL80211_IFTYPE_STATION: 455 case NL80211_IFTYPE_STATION:
456 del_timer_sync(&sdata->u.mgd.chswitch_timer); 456 del_timer_sync(&sdata->u.mgd.chswitch_timer);
457 del_timer_sync(&sdata->u.mgd.timer); 457 del_timer_sync(&sdata->u.mgd.timer);
458 del_timer_sync(&sdata->u.mgd.conn_mon_timer); 458 del_timer_sync(&sdata->u.mgd.conn_mon_timer);
459 del_timer_sync(&sdata->u.mgd.bcn_mon_timer); 459 del_timer_sync(&sdata->u.mgd.bcn_mon_timer);
460 /* 460 /*
461 * If any of the timers fired while we waited for it, it will 461 * If any of the timers fired while we waited for it, it will
462 * have queued its work. Now the work will be running again 462 * have queued its work. Now the work will be running again
463 * but will not rearm the timer again because it checks 463 * but will not rearm the timer again because it checks
464 * whether the interface is running, which, at this point, 464 * whether the interface is running, which, at this point,
465 * it no longer is. 465 * it no longer is.
466 */ 466 */
467 cancel_work_sync(&sdata->u.mgd.work); 467 cancel_work_sync(&sdata->u.mgd.work);
468 cancel_work_sync(&sdata->u.mgd.chswitch_work); 468 cancel_work_sync(&sdata->u.mgd.chswitch_work);
469 cancel_work_sync(&sdata->u.mgd.monitor_work); 469 cancel_work_sync(&sdata->u.mgd.monitor_work);
470 cancel_work_sync(&sdata->u.mgd.beacon_loss_work); 470 cancel_work_sync(&sdata->u.mgd.beacon_loss_work);
471 471
472 /* 472 /*
473 * When we get here, the interface is marked down. 473 * When we get here, the interface is marked down.
474 * Call synchronize_rcu() to wait for the RX path 474 * Call synchronize_rcu() to wait for the RX path
475 * should it be using the interface and enqueuing 475 * should it be using the interface and enqueuing
476 * frames at this very time on another CPU. 476 * frames at this very time on another CPU.
477 */ 477 */
478 synchronize_rcu(); 478 synchronize_rcu();
479 skb_queue_purge(&sdata->u.mgd.skb_queue); 479 skb_queue_purge(&sdata->u.mgd.skb_queue);
480 /* fall through */ 480 /* fall through */
481 case NL80211_IFTYPE_ADHOC: 481 case NL80211_IFTYPE_ADHOC:
482 if (sdata->vif.type == NL80211_IFTYPE_ADHOC) { 482 if (sdata->vif.type == NL80211_IFTYPE_ADHOC) {
483 del_timer_sync(&sdata->u.ibss.timer); 483 del_timer_sync(&sdata->u.ibss.timer);
484 cancel_work_sync(&sdata->u.ibss.work); 484 cancel_work_sync(&sdata->u.ibss.work);
485 synchronize_rcu(); 485 synchronize_rcu();
486 skb_queue_purge(&sdata->u.ibss.skb_queue); 486 skb_queue_purge(&sdata->u.ibss.skb_queue);
487 } 487 }
488 /* fall through */ 488 /* fall through */
489 case NL80211_IFTYPE_MESH_POINT: 489 case NL80211_IFTYPE_MESH_POINT:
490 if (ieee80211_vif_is_mesh(&sdata->vif)) { 490 if (ieee80211_vif_is_mesh(&sdata->vif)) {
491 /* other_bss and allmulti are always set on mesh 491 /* other_bss and allmulti are always set on mesh
492 * ifaces */ 492 * ifaces */
493 local->fif_other_bss--; 493 local->fif_other_bss--;
494 atomic_dec(&local->iff_allmultis); 494 atomic_dec(&local->iff_allmultis);
495 495
496 ieee80211_configure_filter(local); 496 ieee80211_configure_filter(local);
497 497
498 ieee80211_stop_mesh(sdata); 498 ieee80211_stop_mesh(sdata);
499 } 499 }
500 /* fall through */ 500 /* fall through */
501 default: 501 default:
502 if (local->scan_sdata == sdata) 502 if (local->scan_sdata == sdata)
503 ieee80211_scan_cancel(local); 503 ieee80211_scan_cancel(local);
504 504
505 /* 505 /*
506 * Disable beaconing for AP and mesh, IBSS can't 506 * Disable beaconing for AP and mesh, IBSS can't
507 * still be joined to a network at this point. 507 * still be joined to a network at this point.
508 */ 508 */
509 if (sdata->vif.type == NL80211_IFTYPE_AP || 509 if (sdata->vif.type == NL80211_IFTYPE_AP ||
510 sdata->vif.type == NL80211_IFTYPE_MESH_POINT) { 510 sdata->vif.type == NL80211_IFTYPE_MESH_POINT) {
511 ieee80211_bss_info_change_notify(sdata, 511 ieee80211_bss_info_change_notify(sdata,
512 BSS_CHANGED_BEACON_ENABLED); 512 BSS_CHANGED_BEACON_ENABLED);
513 } 513 }
514 514
515 conf.vif = &sdata->vif; 515 conf.vif = &sdata->vif;
516 conf.type = sdata->vif.type; 516 conf.type = sdata->vif.type;
517 conf.mac_addr = dev->dev_addr; 517 conf.mac_addr = dev->dev_addr;
518 /* disable all keys for as long as this netdev is down */ 518 /* disable all keys for as long as this netdev is down */
519 ieee80211_disable_keys(sdata); 519 ieee80211_disable_keys(sdata);
520 drv_remove_interface(local, &conf); 520 drv_remove_interface(local, &conf);
521 } 521 }
522 522
523 sdata->bss = NULL; 523 sdata->bss = NULL;
524 524
525 hw_reconf_flags |= __ieee80211_recalc_idle(local); 525 hw_reconf_flags |= __ieee80211_recalc_idle(local);
526 526
527 ieee80211_recalc_ps(local, -1); 527 ieee80211_recalc_ps(local, -1);
528 528
529 if (local->open_count == 0) { 529 if (local->open_count == 0) {
530 ieee80211_clear_tx_pending(local); 530 ieee80211_clear_tx_pending(local);
531 ieee80211_stop_device(local); 531 ieee80211_stop_device(local);
532 532
533 /* no reconfiguring after stop! */ 533 /* no reconfiguring after stop! */
534 hw_reconf_flags = 0; 534 hw_reconf_flags = 0;
535 } 535 }
536 536
537 /* do after stop to avoid reconfiguring when we stop anyway */ 537 /* do after stop to avoid reconfiguring when we stop anyway */
538 if (hw_reconf_flags) 538 if (hw_reconf_flags)
539 ieee80211_hw_config(local, hw_reconf_flags); 539 ieee80211_hw_config(local, hw_reconf_flags);
540 540
541 spin_lock_irqsave(&local->queue_stop_reason_lock, flags); 541 spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
542 for (i = 0; i < IEEE80211_MAX_QUEUES; i++) { 542 for (i = 0; i < IEEE80211_MAX_QUEUES; i++) {
543 skb_queue_walk_safe(&local->pending[i], skb, tmp) { 543 skb_queue_walk_safe(&local->pending[i], skb, tmp) {
544 struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); 544 struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
545 if (info->control.vif == &sdata->vif) { 545 if (info->control.vif == &sdata->vif) {
546 __skb_unlink(skb, &local->pending[i]); 546 __skb_unlink(skb, &local->pending[i]);
547 dev_kfree_skb_irq(skb); 547 dev_kfree_skb_irq(skb);
548 } 548 }
549 } 549 }
550 } 550 }
551 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags); 551 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
552 552
553 return 0; 553 return 0;
554 } 554 }
555 555
556 static void ieee80211_set_multicast_list(struct net_device *dev) 556 static void ieee80211_set_multicast_list(struct net_device *dev)
557 { 557 {
558 struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); 558 struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
559 struct ieee80211_local *local = sdata->local; 559 struct ieee80211_local *local = sdata->local;
560 int allmulti, promisc, sdata_allmulti, sdata_promisc; 560 int allmulti, promisc, sdata_allmulti, sdata_promisc;
561 561
562 allmulti = !!(dev->flags & IFF_ALLMULTI); 562 allmulti = !!(dev->flags & IFF_ALLMULTI);
563 promisc = !!(dev->flags & IFF_PROMISC); 563 promisc = !!(dev->flags & IFF_PROMISC);
564 sdata_allmulti = !!(sdata->flags & IEEE80211_SDATA_ALLMULTI); 564 sdata_allmulti = !!(sdata->flags & IEEE80211_SDATA_ALLMULTI);
565 sdata_promisc = !!(sdata->flags & IEEE80211_SDATA_PROMISC); 565 sdata_promisc = !!(sdata->flags & IEEE80211_SDATA_PROMISC);
566 566
567 if (allmulti != sdata_allmulti) { 567 if (allmulti != sdata_allmulti) {
568 if (dev->flags & IFF_ALLMULTI) 568 if (dev->flags & IFF_ALLMULTI)
569 atomic_inc(&local->iff_allmultis); 569 atomic_inc(&local->iff_allmultis);
570 else 570 else
571 atomic_dec(&local->iff_allmultis); 571 atomic_dec(&local->iff_allmultis);
572 sdata->flags ^= IEEE80211_SDATA_ALLMULTI; 572 sdata->flags ^= IEEE80211_SDATA_ALLMULTI;
573 } 573 }
574 574
575 if (promisc != sdata_promisc) { 575 if (promisc != sdata_promisc) {
576 if (dev->flags & IFF_PROMISC) 576 if (dev->flags & IFF_PROMISC)
577 atomic_inc(&local->iff_promiscs); 577 atomic_inc(&local->iff_promiscs);
578 else 578 else
579 atomic_dec(&local->iff_promiscs); 579 atomic_dec(&local->iff_promiscs);
580 sdata->flags ^= IEEE80211_SDATA_PROMISC; 580 sdata->flags ^= IEEE80211_SDATA_PROMISC;
581 } 581 }
582 spin_lock_bh(&local->filter_lock); 582 spin_lock_bh(&local->filter_lock);
583 __dev_addr_sync(&local->mc_list, &local->mc_count, 583 __dev_addr_sync(&local->mc_list, &local->mc_count,
584 &dev->mc_list, &dev->mc_count); 584 &dev->mc_list, &dev->mc_count);
585 spin_unlock_bh(&local->filter_lock); 585 spin_unlock_bh(&local->filter_lock);
586 ieee80211_queue_work(&local->hw, &local->reconfig_filter); 586 ieee80211_queue_work(&local->hw, &local->reconfig_filter);
587 } 587 }
588 588
589 /* 589 /*
590 * Called when the netdev is removed or, by the code below, before 590 * Called when the netdev is removed or, by the code below, before
591 * the interface type changes. 591 * the interface type changes.
592 */ 592 */
593 static void ieee80211_teardown_sdata(struct net_device *dev) 593 static void ieee80211_teardown_sdata(struct net_device *dev)
594 { 594 {
595 struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); 595 struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
596 struct ieee80211_local *local = sdata->local; 596 struct ieee80211_local *local = sdata->local;
597 struct beacon_data *beacon; 597 struct beacon_data *beacon;
598 struct sk_buff *skb; 598 struct sk_buff *skb;
599 int flushed; 599 int flushed;
600 int i; 600 int i;
601 601
602 /* free extra data */ 602 /* free extra data */
603 ieee80211_free_keys(sdata); 603 ieee80211_free_keys(sdata);
604 604
605 ieee80211_debugfs_remove_netdev(sdata); 605 ieee80211_debugfs_remove_netdev(sdata);
606 606
607 for (i = 0; i < IEEE80211_FRAGMENT_MAX; i++) 607 for (i = 0; i < IEEE80211_FRAGMENT_MAX; i++)
608 __skb_queue_purge(&sdata->fragments[i].skb_list); 608 __skb_queue_purge(&sdata->fragments[i].skb_list);
609 sdata->fragment_next = 0; 609 sdata->fragment_next = 0;
610 610
611 switch (sdata->vif.type) { 611 switch (sdata->vif.type) {
612 case NL80211_IFTYPE_AP: 612 case NL80211_IFTYPE_AP:
613 beacon = sdata->u.ap.beacon; 613 beacon = sdata->u.ap.beacon;
614 rcu_assign_pointer(sdata->u.ap.beacon, NULL); 614 rcu_assign_pointer(sdata->u.ap.beacon, NULL);
615 synchronize_rcu(); 615 synchronize_rcu();
616 kfree(beacon); 616 kfree(beacon);
617 617
618 while ((skb = skb_dequeue(&sdata->u.ap.ps_bc_buf))) { 618 while ((skb = skb_dequeue(&sdata->u.ap.ps_bc_buf))) {
619 local->total_ps_buffered--; 619 local->total_ps_buffered--;
620 dev_kfree_skb(skb); 620 dev_kfree_skb(skb);
621 } 621 }
622 622
623 break; 623 break;
624 case NL80211_IFTYPE_MESH_POINT: 624 case NL80211_IFTYPE_MESH_POINT:
625 if (ieee80211_vif_is_mesh(&sdata->vif)) 625 if (ieee80211_vif_is_mesh(&sdata->vif))
626 mesh_rmc_free(sdata); 626 mesh_rmc_free(sdata);
627 break; 627 break;
628 case NL80211_IFTYPE_ADHOC: 628 case NL80211_IFTYPE_ADHOC:
629 if (WARN_ON(sdata->u.ibss.presp)) 629 if (WARN_ON(sdata->u.ibss.presp))
630 kfree_skb(sdata->u.ibss.presp); 630 kfree_skb(sdata->u.ibss.presp);
631 break; 631 break;
632 case NL80211_IFTYPE_STATION: 632 case NL80211_IFTYPE_STATION:
633 case NL80211_IFTYPE_WDS: 633 case NL80211_IFTYPE_WDS:
634 case NL80211_IFTYPE_AP_VLAN: 634 case NL80211_IFTYPE_AP_VLAN:
635 case NL80211_IFTYPE_MONITOR: 635 case NL80211_IFTYPE_MONITOR:
636 break; 636 break;
637 case NL80211_IFTYPE_UNSPECIFIED: 637 case NL80211_IFTYPE_UNSPECIFIED:
638 case __NL80211_IFTYPE_AFTER_LAST: 638 case __NL80211_IFTYPE_AFTER_LAST:
639 BUG(); 639 BUG();
640 break; 640 break;
641 } 641 }
642 642
643 flushed = sta_info_flush(local, sdata); 643 flushed = sta_info_flush(local, sdata);
644 WARN_ON(flushed); 644 WARN_ON(flushed);
645 } 645 }
646 646
647 static const struct net_device_ops ieee80211_dataif_ops = { 647 static const struct net_device_ops ieee80211_dataif_ops = {
648 .ndo_open = ieee80211_open, 648 .ndo_open = ieee80211_open,
649 .ndo_stop = ieee80211_stop, 649 .ndo_stop = ieee80211_stop,
650 .ndo_uninit = ieee80211_teardown_sdata, 650 .ndo_uninit = ieee80211_teardown_sdata,
651 .ndo_start_xmit = ieee80211_subif_start_xmit, 651 .ndo_start_xmit = ieee80211_subif_start_xmit,
652 .ndo_set_multicast_list = ieee80211_set_multicast_list, 652 .ndo_set_multicast_list = ieee80211_set_multicast_list,
653 .ndo_change_mtu = ieee80211_change_mtu, 653 .ndo_change_mtu = ieee80211_change_mtu,
654 .ndo_set_mac_address = eth_mac_addr, 654 .ndo_set_mac_address = eth_mac_addr,
655 }; 655 };
656 656
657 static const struct net_device_ops ieee80211_monitorif_ops = { 657 static const struct net_device_ops ieee80211_monitorif_ops = {
658 .ndo_open = ieee80211_open, 658 .ndo_open = ieee80211_open,
659 .ndo_stop = ieee80211_stop, 659 .ndo_stop = ieee80211_stop,
660 .ndo_uninit = ieee80211_teardown_sdata, 660 .ndo_uninit = ieee80211_teardown_sdata,
661 .ndo_start_xmit = ieee80211_monitor_start_xmit, 661 .ndo_start_xmit = ieee80211_monitor_start_xmit,
662 .ndo_set_multicast_list = ieee80211_set_multicast_list, 662 .ndo_set_multicast_list = ieee80211_set_multicast_list,
663 .ndo_change_mtu = ieee80211_change_mtu, 663 .ndo_change_mtu = ieee80211_change_mtu,
664 .ndo_set_mac_address = eth_mac_addr, 664 .ndo_set_mac_address = eth_mac_addr,
665 }; 665 };
666 666
667 static void ieee80211_if_setup(struct net_device *dev) 667 static void ieee80211_if_setup(struct net_device *dev)
668 { 668 {
669 ether_setup(dev); 669 ether_setup(dev);
670 dev->netdev_ops = &ieee80211_dataif_ops; 670 dev->netdev_ops = &ieee80211_dataif_ops;
671 dev->destructor = free_netdev; 671 dev->destructor = free_netdev;
672 } 672 }
673 673
674 /* 674 /*
675 * Helper function to initialise an interface to a specific type. 675 * Helper function to initialise an interface to a specific type.
676 */ 676 */
677 static void ieee80211_setup_sdata(struct ieee80211_sub_if_data *sdata, 677 static void ieee80211_setup_sdata(struct ieee80211_sub_if_data *sdata,
678 enum nl80211_iftype type) 678 enum nl80211_iftype type)
679 { 679 {
680 /* clear type-dependent union */ 680 /* clear type-dependent union */
681 memset(&sdata->u, 0, sizeof(sdata->u)); 681 memset(&sdata->u, 0, sizeof(sdata->u));
682 682
683 /* and set some type-dependent values */ 683 /* and set some type-dependent values */
684 sdata->vif.type = type; 684 sdata->vif.type = type;
685 sdata->dev->netdev_ops = &ieee80211_dataif_ops; 685 sdata->dev->netdev_ops = &ieee80211_dataif_ops;
686 sdata->wdev.iftype = type; 686 sdata->wdev.iftype = type;
687 687
688 /* only monitor differs */ 688 /* only monitor differs */
689 sdata->dev->type = ARPHRD_ETHER; 689 sdata->dev->type = ARPHRD_ETHER;
690 690
691 switch (type) { 691 switch (type) {
692 case NL80211_IFTYPE_AP: 692 case NL80211_IFTYPE_AP:
693 skb_queue_head_init(&sdata->u.ap.ps_bc_buf); 693 skb_queue_head_init(&sdata->u.ap.ps_bc_buf);
694 INIT_LIST_HEAD(&sdata->u.ap.vlans); 694 INIT_LIST_HEAD(&sdata->u.ap.vlans);
695 break; 695 break;
696 case NL80211_IFTYPE_STATION: 696 case NL80211_IFTYPE_STATION:
697 ieee80211_sta_setup_sdata(sdata); 697 ieee80211_sta_setup_sdata(sdata);
698 break; 698 break;
699 case NL80211_IFTYPE_ADHOC: 699 case NL80211_IFTYPE_ADHOC:
700 ieee80211_ibss_setup_sdata(sdata); 700 ieee80211_ibss_setup_sdata(sdata);
701 break; 701 break;
702 case NL80211_IFTYPE_MESH_POINT: 702 case NL80211_IFTYPE_MESH_POINT:
703 if (ieee80211_vif_is_mesh(&sdata->vif)) 703 if (ieee80211_vif_is_mesh(&sdata->vif))
704 ieee80211_mesh_init_sdata(sdata); 704 ieee80211_mesh_init_sdata(sdata);
705 break; 705 break;
706 case NL80211_IFTYPE_MONITOR: 706 case NL80211_IFTYPE_MONITOR:
707 sdata->dev->type = ARPHRD_IEEE80211_RADIOTAP; 707 sdata->dev->type = ARPHRD_IEEE80211_RADIOTAP;
708 sdata->dev->netdev_ops = &ieee80211_monitorif_ops; 708 sdata->dev->netdev_ops = &ieee80211_monitorif_ops;
709 sdata->u.mntr_flags = MONITOR_FLAG_CONTROL | 709 sdata->u.mntr_flags = MONITOR_FLAG_CONTROL |
710 MONITOR_FLAG_OTHER_BSS; 710 MONITOR_FLAG_OTHER_BSS;
711 break; 711 break;
712 case NL80211_IFTYPE_WDS: 712 case NL80211_IFTYPE_WDS:
713 case NL80211_IFTYPE_AP_VLAN: 713 case NL80211_IFTYPE_AP_VLAN:
714 break; 714 break;
715 case NL80211_IFTYPE_UNSPECIFIED: 715 case NL80211_IFTYPE_UNSPECIFIED:
716 case __NL80211_IFTYPE_AFTER_LAST: 716 case __NL80211_IFTYPE_AFTER_LAST:
717 BUG(); 717 BUG();
718 break; 718 break;
719 } 719 }
720 720
721 ieee80211_debugfs_add_netdev(sdata); 721 ieee80211_debugfs_add_netdev(sdata);
722 } 722 }
723 723
724 int ieee80211_if_change_type(struct ieee80211_sub_if_data *sdata, 724 int ieee80211_if_change_type(struct ieee80211_sub_if_data *sdata,
725 enum nl80211_iftype type) 725 enum nl80211_iftype type)
726 { 726 {
727 ASSERT_RTNL(); 727 ASSERT_RTNL();
728 728
729 if (type == sdata->vif.type) 729 if (type == sdata->vif.type)
730 return 0; 730 return 0;
731 731
732 /* Setting ad-hoc mode on non-IBSS channel is not supported. */ 732 /* Setting ad-hoc mode on non-IBSS channel is not supported. */
733 if (sdata->local->oper_channel->flags & IEEE80211_CHAN_NO_IBSS && 733 if (sdata->local->oper_channel->flags & IEEE80211_CHAN_NO_IBSS &&
734 type == NL80211_IFTYPE_ADHOC) 734 type == NL80211_IFTYPE_ADHOC)
735 return -EOPNOTSUPP; 735 return -EOPNOTSUPP;
736 736
737 /* 737 /*
738 * We could, here, on changes between IBSS/STA/MESH modes, 738 * We could, here, on changes between IBSS/STA/MESH modes,
739 * invoke an MLME function instead that disassociates etc. 739 * invoke an MLME function instead that disassociates etc.
740 * and goes into the requested mode. 740 * and goes into the requested mode.
741 */ 741 */
742 742
743 if (netif_running(sdata->dev)) 743 if (netif_running(sdata->dev))
744 return -EBUSY; 744 return -EBUSY;
745 745
746 /* Purge and reset type-dependent state. */ 746 /* Purge and reset type-dependent state. */
747 ieee80211_teardown_sdata(sdata->dev); 747 ieee80211_teardown_sdata(sdata->dev);
748 ieee80211_setup_sdata(sdata, type); 748 ieee80211_setup_sdata(sdata, type);
749 749
750 /* reset some values that shouldn't be kept across type changes */ 750 /* reset some values that shouldn't be kept across type changes */
751 sdata->vif.bss_conf.basic_rates = 751 sdata->vif.bss_conf.basic_rates =
752 ieee80211_mandatory_rates(sdata->local, 752 ieee80211_mandatory_rates(sdata->local,
753 sdata->local->hw.conf.channel->band); 753 sdata->local->hw.conf.channel->band);
754 sdata->drop_unencrypted = 0; 754 sdata->drop_unencrypted = 0;
755 if (type == NL80211_IFTYPE_STATION) 755 if (type == NL80211_IFTYPE_STATION)
756 sdata->u.mgd.use_4addr = false; 756 sdata->u.mgd.use_4addr = false;
757 757
758 return 0; 758 return 0;
759 } 759 }
760 760
761 int ieee80211_if_add(struct ieee80211_local *local, const char *name, 761 int ieee80211_if_add(struct ieee80211_local *local, const char *name,
762 struct net_device **new_dev, enum nl80211_iftype type, 762 struct net_device **new_dev, enum nl80211_iftype type,
763 struct vif_params *params) 763 struct vif_params *params)
764 { 764 {
765 struct net_device *ndev; 765 struct net_device *ndev;
766 struct ieee80211_sub_if_data *sdata = NULL; 766 struct ieee80211_sub_if_data *sdata = NULL;
767 int ret, i; 767 int ret, i;
768 768
769 ASSERT_RTNL(); 769 ASSERT_RTNL();
770 770
771 ndev = alloc_netdev(sizeof(*sdata) + local->hw.vif_data_size, 771 ndev = alloc_netdev(sizeof(*sdata) + local->hw.vif_data_size,
772 name, ieee80211_if_setup); 772 name, ieee80211_if_setup);
773 if (!ndev) 773 if (!ndev)
774 return -ENOMEM; 774 return -ENOMEM;
775 dev_net_set(ndev, wiphy_net(local->hw.wiphy)); 775 dev_net_set(ndev, wiphy_net(local->hw.wiphy));
776 776
777 ndev->needed_headroom = local->tx_headroom + 777 ndev->needed_headroom = local->tx_headroom +
778 4*6 /* four MAC addresses */ 778 4*6 /* four MAC addresses */
779 + 2 + 2 + 2 + 2 /* ctl, dur, seq, qos */ 779 + 2 + 2 + 2 + 2 /* ctl, dur, seq, qos */
780 + 6 /* mesh */ 780 + 6 /* mesh */
781 + 8 /* rfc1042/bridge tunnel */ 781 + 8 /* rfc1042/bridge tunnel */
782 - ETH_HLEN /* ethernet hard_header_len */ 782 - ETH_HLEN /* ethernet hard_header_len */
783 + IEEE80211_ENCRYPT_HEADROOM; 783 + IEEE80211_ENCRYPT_HEADROOM;
784 ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM; 784 ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM;
785 785
786 ret = dev_alloc_name(ndev, ndev->name); 786 ret = dev_alloc_name(ndev, ndev->name);
787 if (ret < 0) 787 if (ret < 0)
788 goto fail; 788 goto fail;
789 789
790 memcpy(ndev->dev_addr, local->hw.wiphy->perm_addr, ETH_ALEN); 790 memcpy(ndev->dev_addr, local->hw.wiphy->perm_addr, ETH_ALEN);
791 memcpy(ndev->perm_addr, ndev->dev_addr, ETH_ALEN); 791 memcpy(ndev->perm_addr, ndev->dev_addr, ETH_ALEN);
792 SET_NETDEV_DEV(ndev, wiphy_dev(local->hw.wiphy)); 792 SET_NETDEV_DEV(ndev, wiphy_dev(local->hw.wiphy));
793 793
794 /* don't use IEEE80211_DEV_TO_SUB_IF because it checks too much */ 794 /* don't use IEEE80211_DEV_TO_SUB_IF because it checks too much */
795 sdata = netdev_priv(ndev); 795 sdata = netdev_priv(ndev);
796 ndev->ieee80211_ptr = &sdata->wdev; 796 ndev->ieee80211_ptr = &sdata->wdev;
797 797
798 /* initialise type-independent data */ 798 /* initialise type-independent data */
799 sdata->wdev.wiphy = local->hw.wiphy; 799 sdata->wdev.wiphy = local->hw.wiphy;
800 sdata->local = local; 800 sdata->local = local;
801 sdata->dev = ndev; 801 sdata->dev = ndev;
802 802
803 for (i = 0; i < IEEE80211_FRAGMENT_MAX; i++) 803 for (i = 0; i < IEEE80211_FRAGMENT_MAX; i++)
804 skb_queue_head_init(&sdata->fragments[i].skb_list); 804 skb_queue_head_init(&sdata->fragments[i].skb_list);
805 805
806 INIT_LIST_HEAD(&sdata->key_list); 806 INIT_LIST_HEAD(&sdata->key_list);
807 807
808 sdata->force_unicast_rateidx = -1; 808 sdata->force_unicast_rateidx = -1;
809 sdata->max_ratectrl_rateidx = -1; 809 sdata->max_ratectrl_rateidx = -1;
810 810
811 /* setup type-dependent data */ 811 /* setup type-dependent data */
812 ieee80211_setup_sdata(sdata, type); 812 ieee80211_setup_sdata(sdata, type);
813 813
814 if (params) { 814 if (params) {
815 ndev->ieee80211_ptr->use_4addr = params->use_4addr; 815 ndev->ieee80211_ptr->use_4addr = params->use_4addr;
816 if (type == NL80211_IFTYPE_STATION) 816 if (type == NL80211_IFTYPE_STATION)
817 sdata->u.mgd.use_4addr = params->use_4addr; 817 sdata->u.mgd.use_4addr = params->use_4addr;
818 } 818 }
819 819
820 ret = register_netdevice(ndev); 820 ret = register_netdevice(ndev);
821 if (ret) 821 if (ret)
822 goto fail; 822 goto fail;
823 823
824 if (ieee80211_vif_is_mesh(&sdata->vif) && 824 if (ieee80211_vif_is_mesh(&sdata->vif) &&
825 params && params->mesh_id_len) 825 params && params->mesh_id_len)
826 ieee80211_sdata_set_mesh_id(sdata, 826 ieee80211_sdata_set_mesh_id(sdata,
827 params->mesh_id_len, 827 params->mesh_id_len,
828 params->mesh_id); 828 params->mesh_id);
829 829
830 mutex_lock(&local->iflist_mtx); 830 mutex_lock(&local->iflist_mtx);
831 list_add_tail_rcu(&sdata->list, &local->interfaces); 831 list_add_tail_rcu(&sdata->list, &local->interfaces);
832 mutex_unlock(&local->iflist_mtx); 832 mutex_unlock(&local->iflist_mtx);
833 833
834 if (new_dev) 834 if (new_dev)
835 *new_dev = ndev; 835 *new_dev = ndev;
836 836
837 return 0; 837 return 0;
838 838
839 fail: 839 fail:
840 free_netdev(ndev); 840 free_netdev(ndev);
841 return ret; 841 return ret;
842 } 842 }
843 843
844 void ieee80211_if_remove(struct ieee80211_sub_if_data *sdata) 844 void ieee80211_if_remove(struct ieee80211_sub_if_data *sdata)
845 { 845 {
846 ASSERT_RTNL(); 846 ASSERT_RTNL();
847 847
848 mutex_lock(&sdata->local->iflist_mtx); 848 mutex_lock(&sdata->local->iflist_mtx);
849 list_del_rcu(&sdata->list); 849 list_del_rcu(&sdata->list);
850 mutex_unlock(&sdata->local->iflist_mtx); 850 mutex_unlock(&sdata->local->iflist_mtx);
851 851
852 synchronize_rcu(); 852 synchronize_rcu();
853 unregister_netdevice(sdata->dev); 853 unregister_netdevice(sdata->dev);
854 } 854 }
855 855
856 /* 856 /*
857 * Remove all interfaces, may only be called at hardware unregistration 857 * Remove all interfaces, may only be called at hardware unregistration
858 * time because it doesn't do RCU-safe list removals. 858 * time because it doesn't do RCU-safe list removals.
859 */ 859 */
860 void ieee80211_remove_interfaces(struct ieee80211_local *local) 860 void ieee80211_remove_interfaces(struct ieee80211_local *local)
861 { 861 {
862 struct ieee80211_sub_if_data *sdata, *tmp; 862 struct ieee80211_sub_if_data *sdata, *tmp;
863 LIST_HEAD(unreg_list);
863 864
864 ASSERT_RTNL(); 865 ASSERT_RTNL();
865 866
867 mutex_lock(&local->iflist_mtx);
866 list_for_each_entry_safe(sdata, tmp, &local->interfaces, list) { 868 list_for_each_entry_safe(sdata, tmp, &local->interfaces, list) {
867 /*
868 * we cannot hold the iflist_mtx across unregister_netdevice,
869 * but we only need to hold it for list modifications to lock
870 * out readers since we're under the RTNL here as all other
871 * writers.
872 */
873 mutex_lock(&local->iflist_mtx);
874 list_del(&sdata->list); 869 list_del(&sdata->list);
875 mutex_unlock(&local->iflist_mtx);
876 870
877 unregister_netdevice(sdata->dev); 871 unregister_netdevice_queue(sdata->dev, &unreg_list);
878 } 872 }
873 mutex_unlock(&local->iflist_mtx);
874 unregister_netdevice_many(&unreg_list);
879 } 875 }
880 876
881 static u32 ieee80211_idle_off(struct ieee80211_local *local, 877 static u32 ieee80211_idle_off(struct ieee80211_local *local,
882 const char *reason) 878 const char *reason)
883 { 879 {
884 if (!(local->hw.conf.flags & IEEE80211_CONF_IDLE)) 880 if (!(local->hw.conf.flags & IEEE80211_CONF_IDLE))
885 return 0; 881 return 0;
886 882
887 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG 883 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
888 printk(KERN_DEBUG "%s: device no longer idle - %s\n", 884 printk(KERN_DEBUG "%s: device no longer idle - %s\n",
889 wiphy_name(local->hw.wiphy), reason); 885 wiphy_name(local->hw.wiphy), reason);
890 #endif 886 #endif
891 887
892 local->hw.conf.flags &= ~IEEE80211_CONF_IDLE; 888 local->hw.conf.flags &= ~IEEE80211_CONF_IDLE;
893 return IEEE80211_CONF_CHANGE_IDLE; 889 return IEEE80211_CONF_CHANGE_IDLE;
894 } 890 }
895 891
896 static u32 ieee80211_idle_on(struct ieee80211_local *local) 892 static u32 ieee80211_idle_on(struct ieee80211_local *local)
897 { 893 {
898 if (local->hw.conf.flags & IEEE80211_CONF_IDLE) 894 if (local->hw.conf.flags & IEEE80211_CONF_IDLE)
899 return 0; 895 return 0;
900 896
901 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG 897 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
902 printk(KERN_DEBUG "%s: device now idle\n", 898 printk(KERN_DEBUG "%s: device now idle\n",
903 wiphy_name(local->hw.wiphy)); 899 wiphy_name(local->hw.wiphy));
904 #endif 900 #endif
905 901
906 local->hw.conf.flags |= IEEE80211_CONF_IDLE; 902 local->hw.conf.flags |= IEEE80211_CONF_IDLE;
907 return IEEE80211_CONF_CHANGE_IDLE; 903 return IEEE80211_CONF_CHANGE_IDLE;
908 } 904 }
909 905
910 u32 __ieee80211_recalc_idle(struct ieee80211_local *local) 906 u32 __ieee80211_recalc_idle(struct ieee80211_local *local)
911 { 907 {
912 struct ieee80211_sub_if_data *sdata; 908 struct ieee80211_sub_if_data *sdata;
913 int count = 0; 909 int count = 0;
914 910
915 if (local->scanning) 911 if (local->scanning)
916 return ieee80211_idle_off(local, "scanning"); 912 return ieee80211_idle_off(local, "scanning");
917 913
918 list_for_each_entry(sdata, &local->interfaces, list) { 914 list_for_each_entry(sdata, &local->interfaces, list) {
919 if (!netif_running(sdata->dev)) 915 if (!netif_running(sdata->dev))
920 continue; 916 continue;
921 /* do not count disabled managed interfaces */ 917 /* do not count disabled managed interfaces */
922 if (sdata->vif.type == NL80211_IFTYPE_STATION && 918 if (sdata->vif.type == NL80211_IFTYPE_STATION &&
923 !sdata->u.mgd.associated && 919 !sdata->u.mgd.associated &&
924 list_empty(&sdata->u.mgd.work_list)) 920 list_empty(&sdata->u.mgd.work_list))
925 continue; 921 continue;
926 /* do not count unused IBSS interfaces */ 922 /* do not count unused IBSS interfaces */
927 if (sdata->vif.type == NL80211_IFTYPE_ADHOC && 923 if (sdata->vif.type == NL80211_IFTYPE_ADHOC &&
928 !sdata->u.ibss.ssid_len) 924 !sdata->u.ibss.ssid_len)
929 continue; 925 continue;
930 /* count everything else */ 926 /* count everything else */
931 count++; 927 count++;
932 } 928 }
933 929
934 if (!count) 930 if (!count)
935 return ieee80211_idle_on(local); 931 return ieee80211_idle_on(local);
936 else 932 else
937 return ieee80211_idle_off(local, "in use"); 933 return ieee80211_idle_off(local, "in use");
938 934
939 return 0; 935 return 0;
940 } 936 }
941 937
942 void ieee80211_recalc_idle(struct ieee80211_local *local) 938 void ieee80211_recalc_idle(struct ieee80211_local *local)
943 { 939 {
944 u32 chg; 940 u32 chg;
945 941
946 mutex_lock(&local->iflist_mtx); 942 mutex_lock(&local->iflist_mtx);
947 chg = __ieee80211_recalc_idle(local); 943 chg = __ieee80211_recalc_idle(local);
948 mutex_unlock(&local->iflist_mtx); 944 mutex_unlock(&local->iflist_mtx);