Deleted Added
sdiff udiff text old ( 190391 ) new ( 190532 )
full compact
ieee80211_node.c (190391) ieee80211_node.c (190532)
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_node.c 190391 2009-03-24 20:39:08Z sam $");
28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_node.c 190532 2009-03-29 21:17:08Z sam $");
29
30#include "opt_wlan.h"
31
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/mbuf.h>
35#include <sys/malloc.h>
36#include <sys/kernel.h>

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

622ieee80211_sync_curchan(struct ieee80211com *ic)
623{
624 struct ieee80211_channel *c;
625
626 c = ieee80211_ht_adjust_channel(ic, ic->ic_curchan, gethtadjustflags(ic));
627 if (c != ic->ic_curchan) {
628 ic->ic_curchan = c;
629 ic->ic_curmode = ieee80211_chan2mode(ic->ic_curchan);
29
30#include "opt_wlan.h"
31
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/mbuf.h>
35#include <sys/malloc.h>
36#include <sys/kernel.h>

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

622ieee80211_sync_curchan(struct ieee80211com *ic)
623{
624 struct ieee80211_channel *c;
625
626 c = ieee80211_ht_adjust_channel(ic, ic->ic_curchan, gethtadjustflags(ic));
627 if (c != ic->ic_curchan) {
628 ic->ic_curchan = c;
629 ic->ic_curmode = ieee80211_chan2mode(ic->ic_curchan);
630 ic->ic_rt = ieee80211_get_ratetable(ic->ic_curchan);
630 ic->ic_set_channel(ic);
631 }
632}
633
634/*
635 * Change the current channel. The request channel may be
636 * promoted if other vap's are operating with HT20/HT40.
637 */

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

646 * after ni_chan is setup for each vap.
647 */
648 /* NB: this assumes IEEE80211_FEXT_USEHT40 > IEEE80211_FEXT_HT */
649 if (flags > ieee80211_htchanflags(c))
650 c = ieee80211_ht_adjust_channel(ic, c, flags);
651 }
652 ic->ic_bsschan = ic->ic_curchan = c;
653 ic->ic_curmode = ieee80211_chan2mode(ic->ic_curchan);
631 ic->ic_set_channel(ic);
632 }
633}
634
635/*
636 * Change the current channel. The request channel may be
637 * promoted if other vap's are operating with HT20/HT40.
638 */

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

647 * after ni_chan is setup for each vap.
648 */
649 /* NB: this assumes IEEE80211_FEXT_USEHT40 > IEEE80211_FEXT_HT */
650 if (flags > ieee80211_htchanflags(c))
651 c = ieee80211_ht_adjust_channel(ic, c, flags);
652 }
653 ic->ic_bsschan = ic->ic_curchan = c;
654 ic->ic_curmode = ieee80211_chan2mode(ic->ic_curchan);
655 ic->ic_rt = ieee80211_get_ratetable(ic->ic_curchan);
654 ic->ic_set_channel(ic);
655}
656
657/*
658 * Join the specified IBSS/BSS network. The node is assumed to
659 * be passed in with a held reference.
660 */
661static int

--- 1897 unchanged lines hidden --- 		656 ic->ic_set_channel(ic);
657}
658
659/*
660 * Join the specified IBSS/BSS network. The node is assumed to
661 * be passed in with a held reference.
662 */
663static int

--- 1897 unchanged lines hidden ---