Deleted Added
full compact
ieee80211_ht.c (295126) ieee80211_ht.c (297405)
1/*-
2 * Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */
25
26#include <sys/cdefs.h>
27#ifdef __FreeBSD__
1/*-
2 * Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */
25
26#include <sys/cdefs.h>
27#ifdef __FreeBSD__
28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_ht.c 295126 2016-02-01 17:41:21Z glebius $");
28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_ht.c 297405 2016-03-30 00:44:10Z adrian $");
29#endif
30
31/*
32 * IEEE 802.11n protocol support.
33 */
34
35#include "opt_inet.h"
36#include "opt_wlan.h"

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

1401 * gone we time out this condition.
1402 */
1403void
1404ieee80211_ht_timeout(struct ieee80211com *ic)
1405{
1406 IEEE80211_LOCK_ASSERT(ic);
1407
1408 if ((ic->ic_flags_ht & IEEE80211_FHT_NONHT_PR) &&
29#endif
30
31/*
32 * IEEE 802.11n protocol support.
33 */
34
35#include "opt_inet.h"
36#include "opt_wlan.h"

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

1401 * gone we time out this condition.
1402 */
1403void
1404ieee80211_ht_timeout(struct ieee80211com *ic)
1405{
1406 IEEE80211_LOCK_ASSERT(ic);
1407
1408 if ((ic->ic_flags_ht & IEEE80211_FHT_NONHT_PR) &&
1409 time_after(ticks, ic->ic_lastnonht + IEEE80211_NONHT_PRESENT_AGE)) {
1409 ieee80211_time_after(ticks, ic->ic_lastnonht + IEEE80211_NONHT_PRESENT_AGE)) {
1410#if 0
1411 IEEE80211_NOTE(vap, IEEE80211_MSG_11N, ni,
1412 "%s", "time out non-HT STA present on channel");
1413#endif
1414 ic->ic_flags_ht &= ~IEEE80211_FHT_NONHT_PR;
1415 htinfo_update(ic);
1416 }
1417}

--- 1562 unchanged lines hidden ---
1410#if 0
1411 IEEE80211_NOTE(vap, IEEE80211_MSG_11N, ni,
1412 "%s", "time out non-HT STA present on channel");
1413#endif
1414 ic->ic_flags_ht &= ~IEEE80211_FHT_NONHT_PR;
1415 htinfo_update(ic);
1416 }
1417}

--- 1562 unchanged lines hidden ---