Attachment #161633 for bug #203236




	IEEE80211_ELEMID_TIM		= 5,
	IEEE80211_ELEMID_IBSSPARMS	= 6,
	IEEE80211_ELEMID_COUNTRY	= 7,
	IEEE80211_ELEMID_BSSLOAD	= 11,
	IEEE80211_ELEMID_CHALLENGE	= 16,
	/* 17-31 reserved for challenge text extension */
	IEEE80211_ELEMID_PWRCNSTR	= 32,

	IEEE80211_ELEMID_QOS		= 46,
	IEEE80211_ELEMID_RSN		= 48,
	IEEE80211_ELEMID_XRATES		= 50,
	IEEE80211_ELEMID_APCHANREP	= 51,
	IEEE80211_ELEMID_HTINFO		= 61,
	IEEE80211_ELEMID_TPC		= 150,
	IEEE80211_ELEMID_CCKM		= 156,

	IEEE80211_ELEMID_MESHGANN	= 125,
	IEEE80211_ELEMID_MESHRANN	= 126,
	/* 127 Extended Capabilities */
	IEEE80211_ELEMID_MESHEXTCAP	= 127,
	/* 128-129 reserved */
	IEEE80211_ELEMID_MESHPREQ	= 130,
	IEEE80211_ELEMID_MESHPREP	= 131,

#define	IEEE80211_COUNTRY_MAX_SIZE \
	(sizeof(struct ieee80211_country_ie) + 3*(IEEE80211_COUNTRY_MAX_BANDS-1))

struct ieee80211_bss_load_ie {
	uint8_t		ie;
	uint8_t		len;
	uint8_t		sta_count;	/* station count */
	uint16_t	chan_load;	/* channel utilization */
	uint16_t	aac;		/* available admission capacity */
} __packed;

struct ieee80211_ap_chan_report_ie {
	uint8_t		ie;
	uint8_t		len;
	uint8_t		class; /* operating class */
	/* Annex E, E.1 Country information and operating classes */
	uint8_t		chan_list[64];
} __packed;

struct ieee80211_extcap_ie {
	uint8_t		ie;
	uint8_t		len;
	struct {
		int cms;			/* 20/40 BSS coexistence management support */
		int rsvd_1;			/* reserved */
		int ecs;			/* extended channel switching */
		int rsvd_3;
		int psmp_cap;			/* PSMP capability */
		int rsvd_5;
		int s_psmp_support;		/* S-PMSP support */
		int event;
		int diagnostics;
		int multicast_diagnostics;
		int location_tracking;
		int fms;
		int proxy_arp;
		int cir;			/* collocated interference reporting */
		int civic_location;
		int geospatial_loc;
		int tfs;
		int wnm_sleep_mode;
		int tim_broadcast;
		int bss_transition;
		int qos_traffic_cap;
		int ac_sta_count;	 	/* AC station count */
		int m_bssid;			/* multiple BSSID field */
		int timing_measurement;
		int ch_usage;			/* channel usage */
		int ssid_list;
		int dms;
		int utc_tsf_offset;
		int tlds_buf_sta_support;	/* TDLS peer U-APSP buffer STA support */
		int tlds_ppsm_support;		/* TDLS peer PSM support */
		int tlds_ch_switching;		/* TDLS channel switching */
		int interworking;
		int qosmap;
		int ebr;
		int sspn_interface;
		int rsvd_35;
		int msgcf_cap;
		int tlds_sup;			/* TDLS support */
		int tlds_prohibited;
		int tlds_ch_sw_prohibited;	/* TDLS channel switching prohibited */
		int ruf;			/* reject unadmitted frame */
		int sig[3];			/* service interval granularity */
		int id_loc;			/* identifier location */
		int u_apsd_coex;		/* U-APSD coexistence */
		int wnm_notification;
		int rsvd_47;
		char ssid[IEEE80211_ADDR_LEN];	/* UTF-8 SSID */
		/* 49-n reserved */
	};
} __packed;

/*
 * 802.11h Quiet Time Element.
 */

Lines 572-577 Link Here

(-)sys/net80211/ieee80211_input.c (+4 lines)
572	case IEEE80211_ELEMID_IBSSPARMS:	572	case IEEE80211_ELEMID_IBSSPARMS:
573	case IEEE80211_ELEMID_CFPARMS:	573	case IEEE80211_ELEMID_CFPARMS:
574	case IEEE80211_ELEMID_PWRCNSTR:	574	case IEEE80211_ELEMID_PWRCNSTR:
		575	case IEEE80211_ELEMID_BSSLOAD:
		576	case IEEE80211_ELEMID_APCHANREP:
575	/* NB: avoid debugging complaints */	577	/* NB: avoid debugging complaints */
576	break;	578	break;
577	case IEEE80211_ELEMID_XRATES:	579	case IEEE80211_ELEMID_XRATES:
Lines 603-608 Link Here
603	case IEEE80211_ELEMID_MESHCONF:	605	case IEEE80211_ELEMID_MESHCONF:
604	scan->meshconf = frm;	606	scan->meshconf = frm;
605	break;	607	break;
		608	case IEEE80211_ELEMID_MESHEXTCAP:
		609	break;
606	#endif	610	#endif
607	case IEEE80211_ELEMID_VENDOR:	611	case IEEE80211_ELEMID_VENDOR:
608	if (iswpaoui(frm))	612	if (iswpaoui(frm))

Return to bug 203236

Lines 706-711 Link Here

(-)sys/net80211/ieee80211.h (+74 lines)
706	IEEE80211_ELEMID_TIM = 5,	706	IEEE80211_ELEMID_TIM = 5,
707	IEEE80211_ELEMID_IBSSPARMS = 6,	707	IEEE80211_ELEMID_IBSSPARMS = 6,
708	IEEE80211_ELEMID_COUNTRY = 7,	708	IEEE80211_ELEMID_COUNTRY = 7,
		709	IEEE80211_ELEMID_BSSLOAD = 11,
709	IEEE80211_ELEMID_CHALLENGE = 16,	710	IEEE80211_ELEMID_CHALLENGE = 16,
710	/* 17-31 reserved for challenge text extension */	711	/* 17-31 reserved for challenge text extension */
711	IEEE80211_ELEMID_PWRCNSTR = 32,	712	IEEE80211_ELEMID_PWRCNSTR = 32,
Lines 723-728 Link Here
723	IEEE80211_ELEMID_QOS = 46,	724	IEEE80211_ELEMID_QOS = 46,
724	IEEE80211_ELEMID_RSN = 48,	725	IEEE80211_ELEMID_RSN = 48,
725	IEEE80211_ELEMID_XRATES = 50,	726	IEEE80211_ELEMID_XRATES = 50,
		727	IEEE80211_ELEMID_APCHANREP = 51,
726	IEEE80211_ELEMID_HTINFO = 61,	728	IEEE80211_ELEMID_HTINFO = 61,
727	IEEE80211_ELEMID_TPC = 150,	729	IEEE80211_ELEMID_TPC = 150,
728	IEEE80211_ELEMID_CCKM = 156,	730	IEEE80211_ELEMID_CCKM = 156,
Lines 747-752 Link Here
747	IEEE80211_ELEMID_MESHGANN = 125,	749	IEEE80211_ELEMID_MESHGANN = 125,
748	IEEE80211_ELEMID_MESHRANN = 126,	750	IEEE80211_ELEMID_MESHRANN = 126,
749	/* 127 Extended Capabilities */	751	/* 127 Extended Capabilities */
		752	IEEE80211_ELEMID_MESHEXTCAP = 127,
750	/* 128-129 reserved */	753	/* 128-129 reserved */
751	IEEE80211_ELEMID_MESHPREQ = 130,	754	IEEE80211_ELEMID_MESHPREQ = 130,
752	IEEE80211_ELEMID_MESHPREP = 131,	755	IEEE80211_ELEMID_MESHPREP = 131,
Lines 781-786 Link Here
781	#define IEEE80211_COUNTRY_MAX_SIZE \	784	#define IEEE80211_COUNTRY_MAX_SIZE \
782	(sizeof(struct ieee80211_country_ie) + 3*(IEEE80211_COUNTRY_MAX_BANDS-1))	785	(sizeof(struct ieee80211_country_ie) + 3*(IEEE80211_COUNTRY_MAX_BANDS-1))
783		786
		787	struct ieee80211_bss_load_ie {
		788	uint8_t ie;
		789	uint8_t len;
		790	uint8_t sta_count; /* station count */
		791	uint16_t chan_load; /* channel utilization */
		792	uint16_t aac; /* available admission capacity */
		793	} __packed;
		794
		795	struct ieee80211_ap_chan_report_ie {
		796	uint8_t ie;
		797	uint8_t len;
		798	uint8_t class; /* operating class */
		799	/* Annex E, E.1 Country information and operating classes */
		800	uint8_t chan_list[64];
		801	} __packed;
		802
		803	struct ieee80211_extcap_ie {
		804	uint8_t ie;
		805	uint8_t len;
		806	struct {
		807	int cms; /* 20/40 BSS coexistence management support */
		808	int rsvd_1; /* reserved */
		809	int ecs; /* extended channel switching */
		810	int rsvd_3;
		811	int psmp_cap; /* PSMP capability */
		812	int rsvd_5;
		813	int s_psmp_support; /* S-PMSP support */
		814	int event;
		815	int diagnostics;
		816	int multicast_diagnostics;
		817	int location_tracking;
		818	int fms;
		819	int proxy_arp;
		820	int cir; /* collocated interference reporting */
		821	int civic_location;
		822	int geospatial_loc;
		823	int tfs;
		824	int wnm_sleep_mode;
		825	int tim_broadcast;
		826	int bss_transition;
		827	int qos_traffic_cap;
		828	int ac_sta_count; /* AC station count */
		829	int m_bssid; /* multiple BSSID field */
		830	int timing_measurement;
		831	int ch_usage; /* channel usage */
		832	int ssid_list;
		833	int dms;
		834	int utc_tsf_offset;
		835	int tlds_buf_sta_support; /* TDLS peer U-APSP buffer STA support */
		836	int tlds_ppsm_support; /* TDLS peer PSM support */
		837	int tlds_ch_switching; /* TDLS channel switching */
		838	int interworking;
		839	int qosmap;
		840	int ebr;
		841	int sspn_interface;
		842	int rsvd_35;
		843	int msgcf_cap;
		844	int tlds_sup; /* TDLS support */
		845	int tlds_prohibited;
		846	int tlds_ch_sw_prohibited; /* TDLS channel switching prohibited */
		847	int ruf; /* reject unadmitted frame */
		848	int sig[3]; /* service interval granularity */
		849	int id_loc; /* identifier location */
		850	int u_apsd_coex; /* U-APSD coexistence */
851	int wnm_notification;
852	int rsvd_47;
853	char ssid[IEEE80211_ADDR_LEN]; /* UTF-8 SSID */
854	/* 49-n reserved */
855	};
856	} __packed;
857
784	/*	858	/*
785	* 802.11h Quiet Time Element.	859	* 802.11h Quiet Time Element.
786	*/	860	*/

Lines 3070-3075 Link Here

(-)sbin/ifconfig/ifieee80211.c (+2 lines)
3070	case IEEE80211_ELEMID_CFPARMS: return " CFPARMS";	3070	case IEEE80211_ELEMID_CFPARMS: return " CFPARMS";
3071	case IEEE80211_ELEMID_TIM: return " TIM";	3071	case IEEE80211_ELEMID_TIM: return " TIM";
3072	case IEEE80211_ELEMID_IBSSPARMS:return " IBSSPARMS";	3072	case IEEE80211_ELEMID_IBSSPARMS:return " IBSSPARMS";
		3073	case IEEE80211_ELEMID_BSSLOAD: return " BSSLOAD";
3073	case IEEE80211_ELEMID_CHALLENGE:return " CHALLENGE";	3074	case IEEE80211_ELEMID_CHALLENGE:return " CHALLENGE";
3074	case IEEE80211_ELEMID_PWRCNSTR: return " PWRCNSTR";	3075	case IEEE80211_ELEMID_PWRCNSTR: return " PWRCNSTR";
3075	case IEEE80211_ELEMID_PWRCAP: return " PWRCAP";	3076	case IEEE80211_ELEMID_PWRCAP: return " PWRCAP";
Lines 3081-3086 Link Here
3081	case IEEE80211_ELEMID_MEASREP: return " MEASREP";	3082	case IEEE80211_ELEMID_MEASREP: return " MEASREP";
3082	case IEEE80211_ELEMID_QUIET: return " QUIET";	3083	case IEEE80211_ELEMID_QUIET: return " QUIET";
3083	case IEEE80211_ELEMID_IBSSDFS: return " IBSSDFS";	3084	case IEEE80211_ELEMID_IBSSDFS: return " IBSSDFS";
		3085	case IEEE80211_ELEMID_APCHANREP:return " APCHANREP";
3084	case IEEE80211_ELEMID_TPC: return " TPC";	3086	case IEEE80211_ELEMID_TPC: return " TPC";
3085	case IEEE80211_ELEMID_CCKM: return " CCKM";	3087	case IEEE80211_ELEMID_CCKM: return " CCKM";
3086	}	3088	}