diff options
Diffstat (limited to 'net/mac80211/iface.c')
-rw-r--r-- | net/mac80211/iface.c | 396 |
1 files changed, 171 insertions, 225 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 06e88a5a036d..610ed1d9893a 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c | |||
@@ -2,6 +2,7 @@ | |||
2 | * Copyright 2002-2005, Instant802 Networks, Inc. | 2 | * Copyright 2002-2005, Instant802 Networks, Inc. |
3 | * Copyright 2005-2006, Devicescape Software, Inc. | 3 | * Copyright 2005-2006, Devicescape Software, Inc. |
4 | * Copyright (c) 2006 Jiri Benc <jbenc@suse.cz> | 4 | * Copyright (c) 2006 Jiri Benc <jbenc@suse.cz> |
5 | * Copyright 2008, Johannes Berg <johannes@sipsolutions.net> | ||
5 | * | 6 | * |
6 | * This program is free software; you can redistribute it and/or modify | 7 | * This program is free software; you can redistribute it and/or modify |
7 | * it under the terms of the GNU General Public License version 2 as | 8 | * it under the terms of the GNU General Public License version 2 as |
@@ -17,38 +18,164 @@ | |||
17 | #include "debugfs_netdev.h" | 18 | #include "debugfs_netdev.h" |
18 | #include "mesh.h" | 19 | #include "mesh.h" |
19 | 20 | ||
20 | void ieee80211_if_sdata_init(struct ieee80211_sub_if_data *sdata) | 21 | /* |
22 | * Called when the netdev is removed or, by the code below, before | ||
23 | * the interface type changes. | ||
24 | */ | ||
25 | static void ieee80211_teardown_sdata(struct net_device *dev) | ||
21 | { | 26 | { |
27 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); | ||
28 | struct ieee80211_local *local = sdata->local; | ||
29 | struct beacon_data *beacon; | ||
30 | struct sk_buff *skb; | ||
31 | int flushed; | ||
22 | int i; | 32 | int i; |
23 | 33 | ||
24 | /* Default values for sub-interface parameters */ | 34 | ieee80211_debugfs_remove_netdev(sdata); |
25 | sdata->drop_unencrypted = 0; | 35 | |
36 | /* free extra data */ | ||
37 | ieee80211_free_keys(sdata); | ||
38 | |||
26 | for (i = 0; i < IEEE80211_FRAGMENT_MAX; i++) | 39 | for (i = 0; i < IEEE80211_FRAGMENT_MAX; i++) |
27 | skb_queue_head_init(&sdata->fragments[i].skb_list); | 40 | __skb_queue_purge(&sdata->fragments[i].skb_list); |
41 | sdata->fragment_next = 0; | ||
28 | 42 | ||
29 | INIT_LIST_HEAD(&sdata->key_list); | 43 | switch (sdata->vif.type) { |
44 | case IEEE80211_IF_TYPE_AP: | ||
45 | beacon = sdata->u.ap.beacon; | ||
46 | rcu_assign_pointer(sdata->u.ap.beacon, NULL); | ||
47 | synchronize_rcu(); | ||
48 | kfree(beacon); | ||
49 | |||
50 | while ((skb = skb_dequeue(&sdata->u.ap.ps_bc_buf))) { | ||
51 | local->total_ps_buffered--; | ||
52 | dev_kfree_skb(skb); | ||
53 | } | ||
54 | |||
55 | break; | ||
56 | case IEEE80211_IF_TYPE_MESH_POINT: | ||
57 | /* Allow compiler to elide mesh_rmc_free call. */ | ||
58 | if (ieee80211_vif_is_mesh(&sdata->vif)) | ||
59 | mesh_rmc_free(dev); | ||
60 | /* fall through */ | ||
61 | case IEEE80211_IF_TYPE_STA: | ||
62 | case IEEE80211_IF_TYPE_IBSS: | ||
63 | kfree(sdata->u.sta.extra_ie); | ||
64 | kfree(sdata->u.sta.assocreq_ies); | ||
65 | kfree(sdata->u.sta.assocresp_ies); | ||
66 | kfree_skb(sdata->u.sta.probe_resp); | ||
67 | break; | ||
68 | case IEEE80211_IF_TYPE_WDS: | ||
69 | case IEEE80211_IF_TYPE_VLAN: | ||
70 | case IEEE80211_IF_TYPE_MNTR: | ||
71 | break; | ||
72 | case IEEE80211_IF_TYPE_INVALID: | ||
73 | BUG(); | ||
74 | break; | ||
75 | } | ||
76 | |||
77 | flushed = sta_info_flush(local, sdata); | ||
78 | WARN_ON(flushed); | ||
30 | } | 79 | } |
31 | 80 | ||
32 | static void ieee80211_if_sdata_deinit(struct ieee80211_sub_if_data *sdata) | 81 | /* |
82 | * Helper function to initialise an interface to a specific type. | ||
83 | */ | ||
84 | static void ieee80211_setup_sdata(struct ieee80211_sub_if_data *sdata, | ||
85 | enum ieee80211_if_types type) | ||
33 | { | 86 | { |
34 | int i; | 87 | struct ieee80211_if_sta *ifsta; |
35 | 88 | ||
36 | for (i = 0; i < IEEE80211_FRAGMENT_MAX; i++) { | 89 | /* clear type-dependent union */ |
37 | __skb_queue_purge(&sdata->fragments[i].skb_list); | 90 | memset(&sdata->u, 0, sizeof(sdata->u)); |
91 | |||
92 | /* and set some type-dependent values */ | ||
93 | sdata->vif.type = type; | ||
94 | |||
95 | /* only monitor differs */ | ||
96 | sdata->dev->type = ARPHRD_ETHER; | ||
97 | |||
98 | switch (type) { | ||
99 | case IEEE80211_IF_TYPE_AP: | ||
100 | skb_queue_head_init(&sdata->u.ap.ps_bc_buf); | ||
101 | INIT_LIST_HEAD(&sdata->u.ap.vlans); | ||
102 | break; | ||
103 | case IEEE80211_IF_TYPE_MESH_POINT: | ||
104 | case IEEE80211_IF_TYPE_STA: | ||
105 | case IEEE80211_IF_TYPE_IBSS: | ||
106 | ifsta = &sdata->u.sta; | ||
107 | INIT_WORK(&ifsta->work, ieee80211_sta_work); | ||
108 | setup_timer(&ifsta->timer, ieee80211_sta_timer, | ||
109 | (unsigned long) sdata); | ||
110 | skb_queue_head_init(&ifsta->skb_queue); | ||
111 | |||
112 | ifsta->capab = WLAN_CAPABILITY_ESS; | ||
113 | ifsta->auth_algs = IEEE80211_AUTH_ALG_OPEN | | ||
114 | IEEE80211_AUTH_ALG_SHARED_KEY; | ||
115 | ifsta->flags |= IEEE80211_STA_CREATE_IBSS | | ||
116 | IEEE80211_STA_AUTO_BSSID_SEL | | ||
117 | IEEE80211_STA_AUTO_CHANNEL_SEL; | ||
118 | if (ieee80211_num_regular_queues(&sdata->local->hw) >= 4) | ||
119 | ifsta->flags |= IEEE80211_STA_WMM_ENABLED; | ||
120 | |||
121 | if (ieee80211_vif_is_mesh(&sdata->vif)) | ||
122 | ieee80211_mesh_init_sdata(sdata); | ||
123 | break; | ||
124 | case IEEE80211_IF_TYPE_MNTR: | ||
125 | sdata->dev->type = ARPHRD_IEEE80211_RADIOTAP; | ||
126 | sdata->dev->hard_start_xmit = ieee80211_monitor_start_xmit; | ||
127 | sdata->u.mntr_flags = MONITOR_FLAG_CONTROL | | ||
128 | MONITOR_FLAG_OTHER_BSS; | ||
129 | break; | ||
130 | case IEEE80211_IF_TYPE_WDS: | ||
131 | case IEEE80211_IF_TYPE_VLAN: | ||
132 | break; | ||
133 | case IEEE80211_IF_TYPE_INVALID: | ||
134 | BUG(); | ||
135 | break; | ||
38 | } | 136 | } |
137 | |||
138 | ieee80211_debugfs_add_netdev(sdata); | ||
139 | } | ||
140 | |||
141 | int ieee80211_if_change_type(struct ieee80211_sub_if_data *sdata, | ||
142 | enum ieee80211_if_types type) | ||
143 | { | ||
144 | ASSERT_RTNL(); | ||
145 | |||
146 | if (type == sdata->vif.type) | ||
147 | return 0; | ||
148 | |||
149 | /* | ||
150 | * We could, here, on changes between IBSS/STA/MESH modes, | ||
151 | * invoke an MLME function instead that disassociates etc. | ||
152 | * and goes into the requested mode. | ||
153 | */ | ||
154 | |||
155 | if (netif_running(sdata->dev)) | ||
156 | return -EBUSY; | ||
157 | |||
158 | /* Purge and reset type-dependent state. */ | ||
159 | ieee80211_teardown_sdata(sdata->dev); | ||
160 | ieee80211_setup_sdata(sdata, type); | ||
161 | |||
162 | /* reset some values that shouldn't be kept across type changes */ | ||
163 | sdata->basic_rates = 0; | ||
164 | sdata->drop_unencrypted = 0; | ||
165 | |||
166 | return 0; | ||
39 | } | 167 | } |
40 | 168 | ||
41 | /* Must be called with rtnl lock held. */ | 169 | int ieee80211_if_add(struct ieee80211_local *local, const char *name, |
42 | int ieee80211_if_add(struct net_device *dev, const char *name, | 170 | struct net_device **new_dev, enum ieee80211_if_types type, |
43 | struct net_device **new_dev, int type, | ||
44 | struct vif_params *params) | 171 | struct vif_params *params) |
45 | { | 172 | { |
46 | struct net_device *ndev; | 173 | struct net_device *ndev; |
47 | struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); | ||
48 | struct ieee80211_sub_if_data *sdata = NULL; | 174 | struct ieee80211_sub_if_data *sdata = NULL; |
49 | int ret; | 175 | int ret, i; |
50 | 176 | ||
51 | ASSERT_RTNL(); | 177 | ASSERT_RTNL(); |
178 | |||
52 | ndev = alloc_netdev(sizeof(*sdata) + local->hw.vif_data_size, | 179 | ndev = alloc_netdev(sizeof(*sdata) + local->hw.vif_data_size, |
53 | name, ieee80211_if_setup); | 180 | name, ieee80211_if_setup); |
54 | if (!ndev) | 181 | if (!ndev) |
@@ -68,26 +195,33 @@ int ieee80211_if_add(struct net_device *dev, const char *name, | |||
68 | goto fail; | 195 | goto fail; |
69 | 196 | ||
70 | memcpy(ndev->dev_addr, local->hw.wiphy->perm_addr, ETH_ALEN); | 197 | memcpy(ndev->dev_addr, local->hw.wiphy->perm_addr, ETH_ALEN); |
71 | ndev->base_addr = dev->base_addr; | ||
72 | ndev->irq = dev->irq; | ||
73 | ndev->mem_start = dev->mem_start; | ||
74 | ndev->mem_end = dev->mem_end; | ||
75 | SET_NETDEV_DEV(ndev, wiphy_dev(local->hw.wiphy)); | 198 | SET_NETDEV_DEV(ndev, wiphy_dev(local->hw.wiphy)); |
76 | 199 | ||
77 | sdata = IEEE80211_DEV_TO_SUB_IF(ndev); | 200 | /* don't use IEEE80211_DEV_TO_SUB_IF because it checks too much */ |
201 | sdata = netdev_priv(ndev); | ||
78 | ndev->ieee80211_ptr = &sdata->wdev; | 202 | ndev->ieee80211_ptr = &sdata->wdev; |
203 | |||
204 | /* initialise type-independent data */ | ||
79 | sdata->wdev.wiphy = local->hw.wiphy; | 205 | sdata->wdev.wiphy = local->hw.wiphy; |
80 | sdata->vif.type = IEEE80211_IF_TYPE_AP; | ||
81 | sdata->dev = ndev; | ||
82 | sdata->local = local; | 206 | sdata->local = local; |
83 | ieee80211_if_sdata_init(sdata); | 207 | sdata->dev = ndev; |
208 | |||
209 | for (i = 0; i < IEEE80211_FRAGMENT_MAX; i++) | ||
210 | skb_queue_head_init(&sdata->fragments[i].skb_list); | ||
211 | |||
212 | INIT_LIST_HEAD(&sdata->key_list); | ||
213 | |||
214 | sdata->force_unicast_rateidx = -1; | ||
215 | sdata->max_ratectrl_rateidx = -1; | ||
216 | |||
217 | /* setup type-dependent data */ | ||
218 | ieee80211_setup_sdata(sdata, type); | ||
84 | 219 | ||
85 | ret = register_netdevice(ndev); | 220 | ret = register_netdevice(ndev); |
86 | if (ret) | 221 | if (ret) |
87 | goto fail; | 222 | goto fail; |
88 | 223 | ||
89 | ieee80211_debugfs_add_netdev(sdata); | 224 | ndev->uninit = ieee80211_teardown_sdata; |
90 | ieee80211_if_set_type(ndev, type); | ||
91 | 225 | ||
92 | if (ieee80211_vif_is_mesh(&sdata->vif) && | 226 | if (ieee80211_vif_is_mesh(&sdata->vif) && |
93 | params && params->mesh_id_len) | 227 | params && params->mesh_id_len) |
@@ -95,11 +229,6 @@ int ieee80211_if_add(struct net_device *dev, const char *name, | |||
95 | params->mesh_id_len, | 229 | params->mesh_id_len, |
96 | params->mesh_id); | 230 | params->mesh_id); |
97 | 231 | ||
98 | /* we're under RTNL so all this is fine */ | ||
99 | if (unlikely(local->reg_state == IEEE80211_DEV_UNREGISTERED)) { | ||
100 | __ieee80211_if_del(local, sdata); | ||
101 | return -ENODEV; | ||
102 | } | ||
103 | list_add_tail_rcu(&sdata->list, &local->interfaces); | 232 | list_add_tail_rcu(&sdata->list, &local->interfaces); |
104 | 233 | ||
105 | if (new_dev) | 234 | if (new_dev) |
@@ -107,217 +236,34 @@ int ieee80211_if_add(struct net_device *dev, const char *name, | |||
107 | 236 | ||
108 | return 0; | 237 | return 0; |
109 | 238 | ||
110 | fail: | 239 | fail: |
111 | free_netdev(ndev); | 240 | free_netdev(ndev); |
112 | return ret; | 241 | return ret; |
113 | } | 242 | } |
114 | 243 | ||
115 | void ieee80211_if_set_type(struct net_device *dev, int type) | 244 | void ieee80211_if_remove(struct net_device *dev) |
116 | { | ||
117 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); | ||
118 | int oldtype = sdata->vif.type; | ||
119 | |||
120 | /* | ||
121 | * We need to call this function on the master interface | ||
122 | * which already has a hard_start_xmit routine assigned | ||
123 | * which must not be changed. | ||
124 | */ | ||
125 | if (dev != sdata->local->mdev) | ||
126 | dev->hard_start_xmit = ieee80211_subif_start_xmit; | ||
127 | |||
128 | /* | ||
129 | * Called even when register_netdevice fails, it would | ||
130 | * oops if assigned before initialising the rest. | ||
131 | */ | ||
132 | dev->uninit = ieee80211_if_reinit; | ||
133 | |||
134 | /* most have no BSS pointer */ | ||
135 | sdata->bss = NULL; | ||
136 | sdata->vif.type = type; | ||
137 | |||
138 | sdata->basic_rates = 0; | ||
139 | |||
140 | switch (type) { | ||
141 | case IEEE80211_IF_TYPE_WDS: | ||
142 | /* nothing special */ | ||
143 | break; | ||
144 | case IEEE80211_IF_TYPE_VLAN: | ||
145 | sdata->u.vlan.ap = NULL; | ||
146 | break; | ||
147 | case IEEE80211_IF_TYPE_AP: | ||
148 | sdata->u.ap.force_unicast_rateidx = -1; | ||
149 | sdata->u.ap.max_ratectrl_rateidx = -1; | ||
150 | skb_queue_head_init(&sdata->u.ap.ps_bc_buf); | ||
151 | sdata->bss = &sdata->u.ap; | ||
152 | INIT_LIST_HEAD(&sdata->u.ap.vlans); | ||
153 | break; | ||
154 | case IEEE80211_IF_TYPE_MESH_POINT: | ||
155 | case IEEE80211_IF_TYPE_STA: | ||
156 | case IEEE80211_IF_TYPE_IBSS: { | ||
157 | struct ieee80211_sub_if_data *msdata; | ||
158 | struct ieee80211_if_sta *ifsta; | ||
159 | |||
160 | ifsta = &sdata->u.sta; | ||
161 | INIT_WORK(&ifsta->work, ieee80211_sta_work); | ||
162 | setup_timer(&ifsta->timer, ieee80211_sta_timer, | ||
163 | (unsigned long) sdata); | ||
164 | skb_queue_head_init(&ifsta->skb_queue); | ||
165 | |||
166 | ifsta->capab = WLAN_CAPABILITY_ESS; | ||
167 | ifsta->auth_algs = IEEE80211_AUTH_ALG_OPEN | | ||
168 | IEEE80211_AUTH_ALG_SHARED_KEY; | ||
169 | ifsta->flags |= IEEE80211_STA_CREATE_IBSS | | ||
170 | IEEE80211_STA_WMM_ENABLED | | ||
171 | IEEE80211_STA_AUTO_BSSID_SEL | | ||
172 | IEEE80211_STA_AUTO_CHANNEL_SEL; | ||
173 | |||
174 | msdata = IEEE80211_DEV_TO_SUB_IF(sdata->local->mdev); | ||
175 | sdata->bss = &msdata->u.ap; | ||
176 | |||
177 | if (ieee80211_vif_is_mesh(&sdata->vif)) | ||
178 | ieee80211_mesh_init_sdata(sdata); | ||
179 | break; | ||
180 | } | ||
181 | case IEEE80211_IF_TYPE_MNTR: | ||
182 | dev->type = ARPHRD_IEEE80211_RADIOTAP; | ||
183 | dev->hard_start_xmit = ieee80211_monitor_start_xmit; | ||
184 | sdata->u.mntr_flags = MONITOR_FLAG_CONTROL | | ||
185 | MONITOR_FLAG_OTHER_BSS; | ||
186 | break; | ||
187 | default: | ||
188 | printk(KERN_WARNING "%s: %s: Unknown interface type 0x%x", | ||
189 | dev->name, __func__, type); | ||
190 | } | ||
191 | ieee80211_debugfs_change_if_type(sdata, oldtype); | ||
192 | } | ||
193 | |||
194 | /* Must be called with rtnl lock held. */ | ||
195 | void ieee80211_if_reinit(struct net_device *dev) | ||
196 | { | 245 | { |
197 | struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); | ||
198 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); | 246 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); |
199 | struct sk_buff *skb; | ||
200 | int flushed; | ||
201 | 247 | ||
202 | ASSERT_RTNL(); | 248 | ASSERT_RTNL(); |
203 | 249 | ||
204 | ieee80211_free_keys(sdata); | 250 | list_del_rcu(&sdata->list); |
205 | 251 | synchronize_rcu(); | |
206 | ieee80211_if_sdata_deinit(sdata); | ||
207 | |||
208 | /* Need to handle mesh specially to allow eliding the function call */ | ||
209 | if (ieee80211_vif_is_mesh(&sdata->vif)) | ||
210 | mesh_rmc_free(dev); | ||
211 | |||
212 | switch (sdata->vif.type) { | ||
213 | case IEEE80211_IF_TYPE_INVALID: | ||
214 | /* cannot happen */ | ||
215 | WARN_ON(1); | ||
216 | break; | ||
217 | case IEEE80211_IF_TYPE_AP: { | ||
218 | /* Remove all virtual interfaces that use this BSS | ||
219 | * as their sdata->bss */ | ||
220 | struct ieee80211_sub_if_data *tsdata, *n; | ||
221 | struct beacon_data *beacon; | ||
222 | |||
223 | list_for_each_entry_safe(tsdata, n, &local->interfaces, list) { | ||
224 | if (tsdata != sdata && tsdata->bss == &sdata->u.ap) { | ||
225 | printk(KERN_DEBUG "%s: removing virtual " | ||
226 | "interface %s because its BSS interface" | ||
227 | " is being removed\n", | ||
228 | sdata->dev->name, tsdata->dev->name); | ||
229 | list_del_rcu(&tsdata->list); | ||
230 | /* | ||
231 | * We have lots of time and can afford | ||
232 | * to sync for each interface | ||
233 | */ | ||
234 | synchronize_rcu(); | ||
235 | __ieee80211_if_del(local, tsdata); | ||
236 | } | ||
237 | } | ||
238 | |||
239 | beacon = sdata->u.ap.beacon; | ||
240 | rcu_assign_pointer(sdata->u.ap.beacon, NULL); | ||
241 | synchronize_rcu(); | ||
242 | kfree(beacon); | ||
243 | |||
244 | while ((skb = skb_dequeue(&sdata->u.ap.ps_bc_buf))) { | ||
245 | local->total_ps_buffered--; | ||
246 | dev_kfree_skb(skb); | ||
247 | } | ||
248 | |||
249 | break; | ||
250 | } | ||
251 | case IEEE80211_IF_TYPE_WDS: | ||
252 | /* nothing to do */ | ||
253 | break; | ||
254 | case IEEE80211_IF_TYPE_MESH_POINT: | ||
255 | case IEEE80211_IF_TYPE_STA: | ||
256 | case IEEE80211_IF_TYPE_IBSS: | ||
257 | kfree(sdata->u.sta.extra_ie); | ||
258 | sdata->u.sta.extra_ie = NULL; | ||
259 | kfree(sdata->u.sta.assocreq_ies); | ||
260 | sdata->u.sta.assocreq_ies = NULL; | ||
261 | kfree(sdata->u.sta.assocresp_ies); | ||
262 | sdata->u.sta.assocresp_ies = NULL; | ||
263 | if (sdata->u.sta.probe_resp) { | ||
264 | dev_kfree_skb(sdata->u.sta.probe_resp); | ||
265 | sdata->u.sta.probe_resp = NULL; | ||
266 | } | ||
267 | |||
268 | break; | ||
269 | case IEEE80211_IF_TYPE_MNTR: | ||
270 | dev->type = ARPHRD_ETHER; | ||
271 | break; | ||
272 | case IEEE80211_IF_TYPE_VLAN: | ||
273 | sdata->u.vlan.ap = NULL; | ||
274 | break; | ||
275 | } | ||
276 | |||
277 | flushed = sta_info_flush(local, sdata); | ||
278 | WARN_ON(flushed); | ||
279 | |||
280 | memset(&sdata->u, 0, sizeof(sdata->u)); | ||
281 | ieee80211_if_sdata_init(sdata); | ||
282 | } | ||
283 | |||
284 | /* Must be called with rtnl lock held. */ | ||
285 | void __ieee80211_if_del(struct ieee80211_local *local, | ||
286 | struct ieee80211_sub_if_data *sdata) | ||
287 | { | ||
288 | struct net_device *dev = sdata->dev; | ||
289 | |||
290 | ieee80211_debugfs_remove_netdev(sdata); | ||
291 | unregister_netdevice(dev); | 252 | unregister_netdevice(dev); |
292 | /* Except master interface, the net_device will be freed by | ||
293 | * net_device->destructor (i. e. ieee80211_if_free). */ | ||
294 | } | 253 | } |
295 | 254 | ||
296 | /* Must be called with rtnl lock held. */ | 255 | /* |
297 | int ieee80211_if_remove(struct net_device *dev, const char *name, int id) | 256 | * Remove all interfaces, may only be called at hardware unregistration |
257 | * time because it doesn't do RCU-safe list removals. | ||
258 | */ | ||
259 | void ieee80211_remove_interfaces(struct ieee80211_local *local) | ||
298 | { | 260 | { |
299 | struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); | 261 | struct ieee80211_sub_if_data *sdata, *tmp; |
300 | struct ieee80211_sub_if_data *sdata, *n; | ||
301 | 262 | ||
302 | ASSERT_RTNL(); | 263 | ASSERT_RTNL(); |
303 | 264 | ||
304 | list_for_each_entry_safe(sdata, n, &local->interfaces, list) { | 265 | list_for_each_entry_safe(sdata, tmp, &local->interfaces, list) { |
305 | if ((sdata->vif.type == id || id == -1) && | 266 | list_del(&sdata->list); |
306 | strcmp(name, sdata->dev->name) == 0 && | 267 | unregister_netdevice(sdata->dev); |
307 | sdata->dev != local->mdev) { | ||
308 | list_del_rcu(&sdata->list); | ||
309 | synchronize_rcu(); | ||
310 | __ieee80211_if_del(local, sdata); | ||
311 | return 0; | ||
312 | } | ||
313 | } | 268 | } |
314 | return -ENODEV; | ||
315 | } | ||
316 | |||
317 | void ieee80211_if_free(struct net_device *dev) | ||
318 | { | ||
319 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); | ||
320 | |||
321 | ieee80211_if_sdata_deinit(sdata); | ||
322 | free_netdev(dev); | ||
323 | } | 269 | } |