svn commit: r298899 - head/sys/net80211

[Andriy Voskoboinyk]

Author: avos
Date: Sun May  1 20:57:10 2016
New Revision: 298899
URL: https://svnweb.freebsd.org/changeset/base/298899

Log:
  net80211: calculate IEEE80211_MODE_BYTES / IEEE80211_CHAN_BYTES
  instead of hardcoding it.
  
  Suggested by:	adrian

Modified:
  head/sys/net80211/_ieee80211.h
  head/sys/net80211/ieee80211_freebsd.h

Modified: head/sys/net80211/_ieee80211.h
==============================================================================
--- head/sys/net80211/_ieee80211.h	Sun May  1 20:54:29 2016	(r298898)
+++ head/sys/net80211/_ieee80211.h	Sun May  1 20:57:10 2016	(r298899)
@@ -70,7 +70,7 @@ enum ieee80211_phymode {
 	IEEE80211_MODE_QUARTER	= 11,	/* OFDM, 1/4x clock */
 };
 #define	IEEE80211_MODE_MAX	(IEEE80211_MODE_QUARTER+1)
-#define	IEEE80211_MODE_BYTES	2	/* howmany(IEEE80211_MODE_MAX, NBBY) */
+#define	IEEE80211_MODE_BYTES	howmany(IEEE80211_MODE_MAX, NBBY)
 
 /*
  * Operating mode.  Devices do not necessarily support
@@ -147,7 +147,7 @@ struct ieee80211_channel {
 };
 
 #define	IEEE80211_CHAN_MAX	256
-#define	IEEE80211_CHAN_BYTES	32	/* howmany(IEEE80211_CHAN_MAX, NBBY) */
+#define	IEEE80211_CHAN_BYTES	howmany(IEEE80211_CHAN_MAX, NBBY)
 #define	IEEE80211_CHAN_ANY	0xffff	/* token for ``any channel'' */
 #define	IEEE80211_CHAN_ANYC \
 	((struct ieee80211_channel *) IEEE80211_CHAN_ANY)

Modified: head/sys/net80211/ieee80211_freebsd.h
==============================================================================
--- head/sys/net80211/ieee80211_freebsd.h	Sun May  1 20:54:29 2016	(r298898)
+++ head/sys/net80211/ieee80211_freebsd.h	Sun May  1 20:57:10 2016	(r298899)
@@ -28,7 +28,7 @@
 #define _NET80211_IEEE80211_FREEBSD_H_
 
 #ifdef _KERNEL
-#include <sys/types.h>
+#include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/counter.h>
 #include <sys/lock.h>