Deleted Added
full compact
ieee80211.c (193655) ieee80211.c (193843)
1/*-
2 * Copyright (c) 2001 Atsushi Onoe
3 * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 11 unchanged lines hidden (view full) ---

20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2001 Atsushi Onoe
3 * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 11 unchanged lines hidden (view full) ---

20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211.c 193655 2009-06-07 22:00:22Z sam $");
28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211.c 193843 2009-06-09 17:11:41Z sam $");
29
30/*
31 * IEEE 802.11 generic handler
32 */
33#include "opt_wlan.h"
34
35#include <sys/param.h>
36#include <sys/systm.h>

--- 240 unchanged lines hidden (view full) ---

277 ieee80211_power_attach(ic);
278 ieee80211_proto_attach(ic);
279#ifdef IEEE80211_SUPPORT_SUPERG
280 ieee80211_superg_attach(ic);
281#endif
282 ieee80211_ht_attach(ic);
283 ieee80211_scan_attach(ic);
284 ieee80211_regdomain_attach(ic);
29
30/*
31 * IEEE 802.11 generic handler
32 */
33#include "opt_wlan.h"
34
35#include <sys/param.h>
36#include <sys/systm.h>

--- 240 unchanged lines hidden (view full) ---

277 ieee80211_power_attach(ic);
278 ieee80211_proto_attach(ic);
279#ifdef IEEE80211_SUPPORT_SUPERG
280 ieee80211_superg_attach(ic);
281#endif
282 ieee80211_ht_attach(ic);
283 ieee80211_scan_attach(ic);
284 ieee80211_regdomain_attach(ic);
285 ieee80211_dfs_attach(ic);
285
286 ieee80211_sysctl_attach(ic);
287
288 ifp->if_addrlen = IEEE80211_ADDR_LEN;
289 ifp->if_hdrlen = 0;
290 if_attach(ifp);
291 ifp->if_mtu = IEEE80211_MTU_MAX;
292 ifp->if_broadcastaddr = ieee80211broadcastaddr;

--- 23 unchanged lines hidden (view full) ---

316
317 if_detach(ifp);
318
319 while ((vap = TAILQ_FIRST(&ic->ic_vaps)) != NULL)
320 ieee80211_vap_destroy(vap);
321 ieee80211_waitfor_parent(ic);
322
323 ieee80211_sysctl_detach(ic);
286
287 ieee80211_sysctl_attach(ic);
288
289 ifp->if_addrlen = IEEE80211_ADDR_LEN;
290 ifp->if_hdrlen = 0;
291 if_attach(ifp);
292 ifp->if_mtu = IEEE80211_MTU_MAX;
293 ifp->if_broadcastaddr = ieee80211broadcastaddr;

--- 23 unchanged lines hidden (view full) ---

317
318 if_detach(ifp);
319
320 while ((vap = TAILQ_FIRST(&ic->ic_vaps)) != NULL)
321 ieee80211_vap_destroy(vap);
322 ieee80211_waitfor_parent(ic);
323
324 ieee80211_sysctl_detach(ic);
325 ieee80211_dfs_detach(ic);
324 ieee80211_regdomain_detach(ic);
325 ieee80211_scan_detach(ic);
326#ifdef IEEE80211_SUPPORT_SUPERG
327 ieee80211_superg_detach(ic);
328#endif
329 ieee80211_ht_detach(ic);
330 /* NB: must be called before ieee80211_node_detach */
331 ieee80211_proto_detach(ic);

--- 1236 unchanged lines hidden ---
326 ieee80211_regdomain_detach(ic);
327 ieee80211_scan_detach(ic);
328#ifdef IEEE80211_SUPPORT_SUPERG
329 ieee80211_superg_detach(ic);
330#endif
331 ieee80211_ht_detach(ic);
332 /* NB: must be called before ieee80211_node_detach */
333 ieee80211_proto_detach(ic);

--- 1236 unchanged lines hidden ---