svn commit: r246537 - head/sys/net80211

[Adrian Chadd]

Author: adrian
Date: Fri Feb  8 09:11:55 2013
New Revision: 246537
URL: http://svnweb.freebsd.org/changeset/base/246537

Log:
  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.

Modified:
  head/sys/net80211/ieee80211_mesh.c

Modified: head/sys/net80211/ieee80211_mesh.c
==============================================================================
--- head/sys/net80211/ieee80211_mesh.c	Fri Feb  8 09:07:03 2013	(r246536)
+++ head/sys/net80211/ieee80211_mesh.c	Fri Feb  8 09:11:55 2013	(r246537)
@@ -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, re
     &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)");