Deleted Added
full compact
ieee80211_dfs.c (181193) ieee80211_dfs.c (193115)
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_dfs.c 181193 2008-08-02 17:58:39Z sam $");
28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_dfs.c 193115 2009-05-30 20:11:23Z sam $");
29#endif
30
31/*
32 * IEEE 802.11 DFS/Radar support.
33 */
34#include "opt_inet.h"
35#include "opt_wlan.h"
36

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

49
50#include <net/if.h>
51#include <net/if_media.h>
52
53#include <net80211/ieee80211_var.h>
54
55MALLOC_DEFINE(M_80211_DFS, "80211dfs", "802.11 DFS state");
56
29#endif
30
31/*
32 * IEEE 802.11 DFS/Radar support.
33 */
34#include "opt_inet.h"
35#include "opt_wlan.h"
36

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

49
50#include <net/if.h>
51#include <net/if_media.h>
52
53#include <net80211/ieee80211_var.h>
54
55MALLOC_DEFINE(M_80211_DFS, "80211dfs", "802.11 DFS state");
56
57/* XXX public for sysctl hookup */
58int ieee80211_nol_timeout = 30*60; /* 30 minutes */
57static int ieee80211_nol_timeout = 30*60; /* 30 minutes */
58SYSCTL_INT(_net_wlan, OID_AUTO, nol_timeout, CTLFLAG_RW,
59 &ieee80211_nol_timeout, 0, "NOL timeout (secs)");
59#define NOL_TIMEOUT msecs_to_ticks(ieee80211_nol_timeout*1000)
60#define NOL_TIMEOUT msecs_to_ticks(ieee80211_nol_timeout*1000)
60int ieee80211_cac_timeout = 60; /* 60 seconds */
61
62static int ieee80211_cac_timeout = 60; /* 60 seconds */
63SYSCTL_INT(_net_wlan, OID_AUTO, cac_timeout, CTLFLAG_RW,
64 &ieee80211_cac_timeout, 0, "CAC timeout (secs)");
61#define CAC_TIMEOUT msecs_to_ticks(ieee80211_cac_timeout*1000)
62
63void
64ieee80211_dfs_attach(struct ieee80211com *ic)
65{
66 struct ieee80211_dfs_state *dfs = &ic->ic_dfs;
67
68 callout_init(&dfs->nol_timer, CALLOUT_MPSAFE);

--- 304 unchanged lines hidden ---
65#define CAC_TIMEOUT msecs_to_ticks(ieee80211_cac_timeout*1000)
66
67void
68ieee80211_dfs_attach(struct ieee80211com *ic)
69{
70 struct ieee80211_dfs_state *dfs = &ic->ic_dfs;
71
72 callout_init(&dfs->nol_timer, CALLOUT_MPSAFE);

--- 304 unchanged lines hidden ---