diff options
author | adrian <adrian@FreeBSD.org> | 2013-02-08 09:11:55 +0000 |
---|---|---|
committer | adrian <adrian@FreeBSD.org> | 2013-02-08 09:11:55 +0000 |
commit | cfebb21d9910a5d21da481b2e73327d5bd39cf98 (patch) | |
tree | 1844ef4a183c6fe037cc454fa969427c7e6cd7ee /sys/net80211/ieee80211_mesh.c | |
parent | 4acae54565d578a2e81cd337e27be6b99051bc97 (diff) | |
download | FreeBSD-src-cfebb21d9910a5d21da481b2e73327d5bd39cf98.zip FreeBSD-src-cfebb21d9910a5d21da481b2e73327d5bd39cf98.tar.gz |
Fix ieee80211_mesh.c compilation.
* Add the superg.h header to allow ieee80211_check_ff() to work
* Since the assert stuff creates assertions based on line numbers and there
was a conflict, just nudge things down a bit.
Diffstat (limited to 'sys/net80211/ieee80211_mesh.c')
-rw-r--r-- | sys/net80211/ieee80211_mesh.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/net80211/ieee80211_mesh.c b/sys/net80211/ieee80211_mesh.c index ee9eaed..6d323cd 100644 --- a/sys/net80211/ieee80211_mesh.c +++ b/sys/net80211/ieee80211_mesh.c @@ -60,6 +60,9 @@ __FBSDID("$FreeBSD$"); #include <net80211/ieee80211_var.h> #include <net80211/ieee80211_action.h> +#ifdef IEEE80211_SUPPORT_SUPERG +#include <net80211/ieee80211_superg.h> +#endif #include <net80211/ieee80211_input.h> #include <net80211/ieee80211_mesh.h> @@ -110,6 +113,7 @@ SYSCTL_PROC(_net_wlan_mesh, OID_AUTO, retrytimeout, CTLTYPE_INT | CTLFLAG_RW, &ieee80211_mesh_retrytimeout, 0, ieee80211_sysctl_msecs_ticks, "I", "Retry timeout (msec)"); static int ieee80211_mesh_holdingtimeout = -1; + SYSCTL_PROC(_net_wlan_mesh, OID_AUTO, holdingtimeout, CTLTYPE_INT | CTLFLAG_RW, &ieee80211_mesh_holdingtimeout, 0, ieee80211_sysctl_msecs_ticks, "I", "Holding state timeout (msec)"); |