d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

distribute sysctl decls so global variables can be made static

Browse Source
This commit is contained in:
Sam Leffler 2009-05-30 20:11:23 +00:00
parent 39c3faaf70
commit a77b10b321
4 changed files with 38 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/net80211/ieee80211_dfs.c
View File

@ -54,10 +54,14 @@ __FBSDID("$FreeBSD$");
MALLOC_DEFINE(M_80211_DFS, "80211dfs", "802.11 DFS state"); MALLOC_DEFINE(M_80211_DFS, "80211dfs", "802.11 DFS state");
/* XXX public for sysctl hookup */ static int ieee80211_nol_timeout = 30*60; /* 30 minutes */
int ieee80211_nol_timeout = 30*60; /* 30 minutes */ SYSCTL_INT(_net_wlan, OID_AUTO, nol_timeout, CTLFLAG_RW,
&ieee80211_nol_timeout, 0, "NOL timeout (secs)");
#define NOL_TIMEOUT msecs_to_ticks(ieee80211_nol_timeout*1000) #define NOL_TIMEOUT msecs_to_ticks(ieee80211_nol_timeout*1000)
int ieee80211_cac_timeout = 60; /* 60 seconds */
static int ieee80211_cac_timeout = 60; /* 60 seconds */
SYSCTL_INT(_net_wlan, OID_AUTO, cac_timeout, CTLFLAG_RW,
&ieee80211_cac_timeout, 0, "CAC timeout (secs)");
#define CAC_TIMEOUT msecs_to_ticks(ieee80211_cac_timeout*1000) #define CAC_TIMEOUT msecs_to_ticks(ieee80211_cac_timeout*1000)
void void

38
sys/net80211/ieee80211_freebsd.c
View File

@ -61,15 +61,6 @@ int ieee80211_debug = 0;
SYSCTL_INT(_net_wlan, OID_AUTO, debug, CTLFLAG_RW, &ieee80211_debug, SYSCTL_INT(_net_wlan, OID_AUTO, debug, CTLFLAG_RW, &ieee80211_debug,
0, "debugging printfs"); 0, "debugging printfs");
#endif #endif
extern int ieee80211_recv_bar_ena;
SYSCTL_INT(_net_wlan, OID_AUTO, recv_bar, CTLFLAG_RW, &ieee80211_recv_bar_ena,
0, "BAR frame processing (ena/dis)");
extern int ieee80211_nol_timeout;
SYSCTL_INT(_net_wlan, OID_AUTO, nol_timeout, CTLFLAG_RW,
&ieee80211_nol_timeout, 0, "NOL timeout (secs)");
extern int ieee80211_cac_timeout;
SYSCTL_INT(_net_wlan, OID_AUTO, cac_timeout, CTLFLAG_RW,
&ieee80211_cac_timeout, 0, "CAC timeout (secs)");
MALLOC_DEFINE(M_80211_COM, "80211com", "802.11 com state"); MALLOC_DEFINE(M_80211_COM, "80211com", "802.11 com state");
@ -174,33 +165,6 @@ ieee80211_sysctl_msecs_ticks(SYSCTL_HANDLER_ARGS)
return 0; return 0;
} }
#ifdef IEEE80211_AMPDU_AGE
extern int ieee80211_ampdu_age;
SYSCTL_PROC(_net_wlan, OID_AUTO, ampdu_age, CTLTYPE_INT | CTLFLAG_RW,
&ieee80211_ampdu_age, 0, ieee80211_sysctl_msecs_ticks, "I",
"AMPDU max reorder age (ms)");
#endif
extern int ieee80211_addba_timeout;
SYSCTL_PROC(_net_wlan, OID_AUTO, addba_timeout, CTLTYPE_INT | CTLFLAG_RW,
&ieee80211_addba_timeout, 0, ieee80211_sysctl_msecs_ticks, "I",
"ADDBA request timeout (ms)");
extern int ieee80211_addba_backoff;
SYSCTL_PROC(_net_wlan, OID_AUTO, addba_backoff, CTLTYPE_INT | CTLFLAG_RW,
&ieee80211_addba_backoff, 0, ieee80211_sysctl_msecs_ticks, "I",
"ADDBA request backoff (ms)");
extern int ieee80211_addba_maxtries;
SYSCTL_INT(_net_wlan, OID_AUTO, addba_maxtries, CTLTYPE_INT | CTLFLAG_RW,
&ieee80211_addba_maxtries, 0, "max ADDBA requests sent before backoff");
#ifdef IEEE80211_SUPPORT_SUPERG
extern int ieee80211_ffppsmin;
SYSCTL_INT(_net_wlan, OID_AUTO, ffppsmin, CTLTYPE_INT | CTLFLAG_RW,
&ieee80211_ffppsmin, 0, "min packet rate before fast-frame staging");
extern int ieee80211_ffagemax;
SYSCTL_PROC(_net_wlan, OID_AUTO, ffagemax, CTLTYPE_INT | CTLFLAG_RW,
&ieee80211_ffagemax, 0, ieee80211_sysctl_msecs_ticks, "I",
"max hold time for fast-frame staging (ms)");
#endif /* IEEE80211_SUPPORT_SUPERG */
static int static int
ieee80211_sysctl_inact(SYSCTL_HANDLER_ARGS) ieee80211_sysctl_inact(SYSCTL_HANDLER_ARGS)
{ {
@ -320,7 +284,7 @@ ieee80211_sysctl_vattach(struct ieee80211vap *vap)
if (vap->iv_caps & IEEE80211_C_DFS) { if (vap->iv_caps & IEEE80211_C_DFS) {
SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(oid), OID_AUTO,
"radar", CTLTYPE_INT | CTLFLAG_RW, vap->iv_ic, 0, "radar", CTLTYPE_INT | CTLFLAG_RW, vap->iv_ic, 0,
ieee80211_sysctl_radar, "I", "simulare radar event"); ieee80211_sysctl_radar, "I", "simulate radar event");
} }
vap->iv_sysctl = ctx; vap->iv_sysctl = ctx;
vap->iv_oid = oid; vap->iv_oid = oid;

31
sys/net80211/ieee80211_ht.c
View File

@ -79,15 +79,30 @@ static const struct ieee80211_htrateset ieee80211_rateset_11n =
}; };
#ifdef IEEE80211_AMPDU_AGE #ifdef IEEE80211_AMPDU_AGE
/* XXX public for sysctl hookup */ static int ieee80211_ampdu_age = -1; /* threshold for ampdu reorder q (ms) */
int ieee80211_ampdu_age = -1; /* threshold for ampdu reorder q (ms) */ SYSCTL_PROC(_net_wlan, OID_AUTO, ampdu_age, CTLTYPE_INT | CTLFLAG_RW,
&ieee80211_ampdu_age, 0, ieee80211_sysctl_msecs_ticks, "I",
"AMPDU max reorder age (ms)");
#endif #endif
int ieee80211_recv_bar_ena = 1;
int ieee80211_addba_timeout = -1; /* timeout waiting for ADDBA response */ static int ieee80211_recv_bar_ena = 1;
int ieee80211_addba_backoff = -1; /* backoff after max ADDBA requests */ SYSCTL_INT(_net_wlan, OID_AUTO, recv_bar, CTLFLAG_RW, &ieee80211_recv_bar_ena,
int ieee80211_addba_maxtries = 3; /* max ADDBA requests before backoff */ 0, "BAR frame processing (ena/dis)");
int ieee80211_bar_timeout = -1; /* timeout waiting for BAR response */
int ieee80211_bar_maxtries = 50; /* max BAR requests before DELBA */ static int ieee80211_addba_timeout = -1;/* timeout for ADDBA response */
SYSCTL_PROC(_net_wlan, OID_AUTO, addba_timeout, CTLTYPE_INT | CTLFLAG_RW,
&ieee80211_addba_timeout, 0, ieee80211_sysctl_msecs_ticks, "I",
"ADDBA request timeout (ms)");
static int ieee80211_addba_backoff = -1;/* backoff after max ADDBA requests */
SYSCTL_PROC(_net_wlan, OID_AUTO, addba_backoff, CTLTYPE_INT | CTLFLAG_RW,
&ieee80211_addba_backoff, 0, ieee80211_sysctl_msecs_ticks, "I",
"ADDBA request backoff (ms)");
static int ieee80211_addba_maxtries = 3;/* max ADDBA requests before backoff */
SYSCTL_INT(_net_wlan, OID_AUTO, addba_maxtries, CTLTYPE_INT | CTLFLAG_RW,
&ieee80211_addba_maxtries, 0, "max ADDBA requests sent before backoff");
static int ieee80211_bar_timeout = -1; /* timeout waiting for BAR response */
static int ieee80211_bar_maxtries = 50;/* max BAR requests before DELBA */
/* /*
* Setup HT parameters that depends on the clock frequency. * Setup HT parameters that depends on the clock frequency.

10
sys/net80211/ieee80211_superg.c
View File

@ -83,9 +83,13 @@ __FBSDID("$FreeBSD$");
#define ETHER_HEADER_COPY(dst, src) \ #define ETHER_HEADER_COPY(dst, src) \
memcpy(dst, src, sizeof(struct ether_header)) memcpy(dst, src, sizeof(struct ether_header))
/* XXX public for sysctl hookup */ static int ieee80211_ffppsmin = 2; /* pps threshold for ff aggregation */
int ieee80211_ffppsmin = 2; /* pps threshold for ff aggregation */ SYSCTL_INT(_net_wlan, OID_AUTO, ffppsmin, CTLTYPE_INT | CTLFLAG_RW,
int ieee80211_ffagemax = -1; /* max time frames held on stage q */ &ieee80211_ffppsmin, 0, "min packet rate before fast-frame staging");
static int ieee80211_ffagemax = -1; /* max time frames held on stage q */
SYSCTL_PROC(_net_wlan, OID_AUTO, ffagemax, CTLTYPE_INT | CTLFLAG_RW,
&ieee80211_ffagemax, 0, ieee80211_sysctl_msecs_ticks, "I",
"max hold time for fast-frame staging (ms)");
void void
ieee80211_superg_attach(struct ieee80211com *ic) ieee80211_superg_attach(struct ieee80211com *ic)