Date: Tue, 7 Dec 2004 00:53:42 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 66596 for review Message-ID: <200412070053.iB70rg8a028120@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=66596 Change 66596 by sam@sam_ebb on 2004/12/07 00:53:40 o yank useless ie union used by ray driver (it'll get moved over there if still needed) o define structs for tim and country ie's Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211.h#5 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211.h#5 (text+ko) ==== @@ -390,56 +390,8 @@ } __packed; /* - * Management information element payloads + * Management information element payloads. */ -union ieee80211_information { - char ssid[IEEE80211_NWID_LEN+1]; - struct rates { - u_int8_t *p; - } rates; - struct fh { - u_int16_t dwell; - u_int8_t set; - u_int8_t pattern; - u_int8_t index; - } fh; - struct ds { - u_int8_t channel; - } ds; - struct cf { - u_int8_t count; - u_int8_t period; - u_int8_t maxdur[2]; - u_int8_t dur[2]; - } cf; - struct tim { - u_int8_t count; - u_int8_t period; - u_int8_t bitctl; - /* u_int8_t pvt[251]; The driver needs to use this. */ - } tim; - struct ibss { - u_int16_t atim; - } ibss; - struct challenge { - u_int8_t *p; - u_int8_t len; - } challenge; - struct erp { - u_int8_t flags; - } erp; - struct country { - u_int8_t cc[3]; /* ISO CC+(I)ndoor/(O)utdoor */ - struct { - u_int8_t schan; /* starting channel */ - u_int8_t nchan; /* number channels */ - u_int8_t maxtxpwr; - } band[4]; /* up to 4 sub bands */ - } country; - struct ath { - u_int8_t flags; - } ath; -}; enum { IEEE80211_ELEMID_SSID = 0, @@ -460,6 +412,26 @@ IEEE80211_ELEMID_VENDOR = 221, /* vendor private */ }; +struct ieee80211_tim_ie { + u_int8_t tim_ie; /* IEEE80211_ELEMID_TIM */ + u_int8_t tim_len; + u_int8_t tim_count; /* DTIM count */ + u_int8_t tim_period; /* DTIM period */ + u_int8_t tim_bitctl; /* bitmap control */ + u_int8_t tim_bitmap[1]; /* variable-length bitmap */ +} __packed; + +struct ieee80211_country_ie { + u_int8_t ie; /* IEEE80211_ELEMID_COUNTRY */ + u_int8_t len; + u_int8_t cc[3]; /* ISO CC+(I)ndoor/(O)utdoor */ + struct { + u_int8_t schan; /* starting channel */ + u_int8_t nchan; /* number channels */ + u_int8_t maxtxpwr; /* tx power cap */ + } band[4] __packed; /* up to 4 sub bands */ +} __packed; + #define IEEE80211_CHALLENGE_LEN 128 #define IEEE80211_RATE_BASIC 0x80
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200412070053.iB70rg8a028120>