svn commit: r313028 - head/sys/net80211

[Andriy Voskoboinyk]

Author: avos
Date: Tue Jan 31 22:21:08 2017
New Revision: 313028
URL: https://svnweb.freebsd.org/changeset/base/313028

Log:
  net80211: cleanup ic_flags / iv_flags
  
  Flags
   - IEEE80211_F_ASCAN
   - IEEE80211_F_SIBSS
   - IEEE80211_F_IBSSON
  are not used since r170530 (old WI compatibility ioctls removal)
  and r178354 (removed from other places).
  
  IEEE80211_F_TXPOW_FIXED was never utilized; initially added with
  IEEE80211_F_TXPOW_AUTO / IEEE80211_F_TXPOW_OFF flags,
  which were replaced with IEEE80211_C_TXPMGT capability check in r138568.
  
  Reviewed by:	adrian
  Differential Revision:	https://reviews.freebsd.org/D9369

Modified:
  head/sys/net80211/ieee80211_node.c
  head/sys/net80211/ieee80211_var.h

Modified: head/sys/net80211/ieee80211_node.c
==============================================================================
--- head/sys/net80211/ieee80211_node.c	Tue Jan 31 21:59:10 2017	(r313027)
+++ head/sys/net80211/ieee80211_node.c	Tue Jan 31 22:21:08 2017	(r313028)
@@ -349,7 +349,6 @@ ieee80211_create_ibss(struct ieee80211va
 		ni->ni_fhindex = 1;
 	}
 	if (vap->iv_opmode == IEEE80211_M_IBSS) {
-		vap->iv_flags |= IEEE80211_F_SIBSS;
 		ni->ni_capinfo |= IEEE80211_CAPINFO_IBSS;	/* XXX */
 		if (vap->iv_flags & IEEE80211_F_DESBSSID)
 			IEEE80211_ADDR_COPY(ni->ni_bssid, vap->iv_des_bssid);

Modified: head/sys/net80211/ieee80211_var.h
==============================================================================
--- head/sys/net80211/ieee80211_var.h	Tue Jan 31 21:59:10 2017	(r313027)
+++ head/sys/net80211/ieee80211_var.h	Tue Jan 31 22:21:08 2017	(r313028)
@@ -572,8 +572,7 @@ MALLOC_DECLARE(M_80211_VAP);
 #define	IEEE80211_F_PRIVACY	0x00000010	/* CONF: privacy enabled */
 #define	IEEE80211_F_PUREG	0x00000020	/* CONF: 11g w/o 11b sta's */
 #define	IEEE80211_F_SCAN	0x00000080	/* STATUS: scanning */
-#define	IEEE80211_F_ASCAN	0x00000100	/* STATUS: active scan */
-#define	IEEE80211_F_SIBSS	0x00000200	/* STATUS: start IBSS */
+/* 0x00000300 reserved */
 /* NB: this is intentionally setup to be IEEE80211_CAPINFO_SHORT_SLOTTIME */
 #define	IEEE80211_F_SHSLOT	0x00000400	/* STATUS: use short slot time*/
 #define	IEEE80211_F_PMGTON	0x00000800	/* CONF: Power mgmt enable */
@@ -581,8 +580,7 @@ MALLOC_DECLARE(M_80211_VAP);
 #define	IEEE80211_F_WME		0x00002000	/* CONF: enable WME use */
 #define	IEEE80211_F_BGSCAN	0x00004000	/* CONF: bg scan enabled (???)*/
 #define	IEEE80211_F_SWRETRY	0x00008000	/* CONF: sw tx retry enabled */
-#define IEEE80211_F_TXPOW_FIXED	0x00010000	/* TX Power: fixed rate */
-#define	IEEE80211_F_IBSSON	0x00020000	/* CONF: IBSS creation enable */
+/* 0x00030000 reserved */
 #define	IEEE80211_F_SHPREAMBLE	0x00040000	/* STATUS: use short preamble */
 #define	IEEE80211_F_DATAPAD	0x00080000	/* CONF: do alignment pad */
 #define	IEEE80211_F_USEPROT	0x00100000	/* STATUS: protection enabled */
@@ -600,9 +598,9 @@ MALLOC_DECLARE(M_80211_VAP);
 #define	IEEE80211_F_DWDS	0x80000000	/* CONF: Dynamic WDS enabled */
 
 #define	IEEE80211_F_BITS \
-	"\20\1TURBOP\2COMP\3FF\4BURST\5PRIVACY\6PUREG\10SCAN\11ASCAN\12SIBSS" \
-	"\13SHSLOT\14PMGTON\15DESBSSID\16WME\17BGSCAN\20SWRETRY\21TXPOW_FIXED" \
-	"\22IBSSON\23SHPREAMBLE\24DATAPAD\25USEPROT\26USERBARKER\27CSAPENDING" \
+	"\20\1TURBOP\2COMP\3FF\4BURST\5PRIVACY\6PUREG\10SCAN" \
+	"\13SHSLOT\14PMGTON\15DESBSSID\16WME\17BGSCAN\20SWRETRY" \
+	"\23SHPREAMBLE\24DATAPAD\25USEPROT\26USERBARKER\27CSAPENDING" \
 	"\30WPA1\31WPA2\32DROPUNENC\33COUNTERM\34HIDESSID\35NOBRIDG\36PCF" \
 	"\37DOTH\40DWDS"