Deleted Added
full compact
ieee80211_node.c (184288) ieee80211_node.c (184303)
1/*-
2 * Copyright (c) 2001 Atsushi Onoe
3 * Copyright (c) 2002-2008 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-2008 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 184288 2008-10-26 01:04:46Z sam $");
28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_node.c 184303 2008-10-26 21:59:07Z 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>

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

593 break;
594 }
595 }
596 return flags;
597}
598
599/*
600 * Check if the current channel needs to change based on whether
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>

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

593 break;
594 }
595 }
596 return flags;
597}
598
599/*
600 * Check if the current channel needs to change based on whether
601 * any vap's are using HT20/HT40. This is used sync the state of
602 * ic_curchan after a channel width change on a running vap.
601 * any vap's are using HT20/HT40. This is used to sync the state
602 * of ic_curchan after a channel width change on a running vap.
603 */
604void
605ieee80211_sync_curchan(struct ieee80211com *ic)
606{
607 struct ieee80211_channel *c;
608
609 c = ieee80211_ht_adjust_channel(ic, ic->ic_curchan, gethtadjustflags(ic));
610 if (c != ic->ic_curchan) {

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

947 IEEE80211_NODE_WDSQ_DESTROY(ni);
948 FREE(ni, M_80211_NODE);
949}
950
951static void
952node_age(struct ieee80211_node *ni)
953{
954 struct ieee80211vap *vap = ni->ni_vap;
603 */
604void
605ieee80211_sync_curchan(struct ieee80211com *ic)
606{
607 struct ieee80211_channel *c;
608
609 c = ieee80211_ht_adjust_channel(ic, ic->ic_curchan, gethtadjustflags(ic));
610 if (c != ic->ic_curchan) {

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

947 IEEE80211_NODE_WDSQ_DESTROY(ni);
948 FREE(ni, M_80211_NODE);
949}
950
951static void
952node_age(struct ieee80211_node *ni)
953{
954 struct ieee80211vap *vap = ni->ni_vap;
955#if 0
956 IEEE80211_NODE_LOCK_ASSERT(&ic->ic_sta);
957#endif
955
956 IEEE80211_NODE_LOCK_ASSERT(&vap->iv_ic->ic_sta);
957
958 /*
959 * Age frames on the power save queue.
960 */
961 if (ieee80211_node_psq_age(ni) != 0 &&
962 ni->ni_psq.psq_len == 0 && vap->iv_set_tim != NULL)
963 vap->iv_set_tim(ni, 0);
964 /*
965 * Age frames on the wds pending queue.

--- 1613 unchanged lines hidden ---
958 /*
959 * Age frames on the power save queue.
960 */
961 if (ieee80211_node_psq_age(ni) != 0 &&
962 ni->ni_psq.psq_len == 0 && vap->iv_set_tim != NULL)
963 vap->iv_set_tim(ni, 0);
964 /*
965 * Age frames on the wds pending queue.

--- 1613 unchanged lines hidden ---