Deleted Added
full compact
ieee80211_node.c (295932) ieee80211_node.c (297405)
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 295932 2016-02-23 21:11:42Z avos $");
28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_node.c 297405 2016-03-30 00:44:10Z adrian $");
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>

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

2633 */
2634static void
2635ieee80211_erp_timeout(struct ieee80211com *ic)
2636{
2637
2638 IEEE80211_LOCK_ASSERT(ic);
2639
2640 if ((ic->ic_flags_ext & IEEE80211_FEXT_NONERP_PR) &&
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>

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

2633 */
2634static void
2635ieee80211_erp_timeout(struct ieee80211com *ic)
2636{
2637
2638 IEEE80211_LOCK_ASSERT(ic);
2639
2640 if ((ic->ic_flags_ext & IEEE80211_FEXT_NONERP_PR) &&
2641 time_after(ticks, ic->ic_lastnonerp + IEEE80211_NONERP_PRESENT_AGE)) {
2641 ieee80211_time_after(ticks, ic->ic_lastnonerp + IEEE80211_NONERP_PRESENT_AGE)) {
2642#if 0
2643 IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC, ni,
2644 "%s", "age out non-ERP sta present on channel");
2645#endif
2646 ic->ic_flags_ext &= ~IEEE80211_FEXT_NONERP_PR;
2647 if (ic->ic_nonerpsta == 0)
2648 disable_protection(ic);
2649 }

--- 179 unchanged lines hidden ---
2642#if 0
2643 IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC, ni,
2644 "%s", "age out non-ERP sta present on channel");
2645#endif
2646 ic->ic_flags_ext &= ~IEEE80211_FEXT_NONERP_PR;
2647 if (ic->ic_nonerpsta == 0)
2648 disable_protection(ic);
2649 }

--- 179 unchanged lines hidden ---