diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ieee80211.h | 13 | ||||
| -rw-r--r-- | include/net/mac80211.h | 4 |
2 files changed, 16 insertions, 1 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index a1630ba0b87c..7f4df7c7659d 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h | |||
| @@ -506,6 +506,19 @@ struct ieee80211_channel_sw_ie { | |||
| 506 | u8 count; | 506 | u8 count; |
| 507 | } __attribute__ ((packed)); | 507 | } __attribute__ ((packed)); |
| 508 | 508 | ||
| 509 | /** | ||
| 510 | * struct ieee80211_tim | ||
| 511 | * | ||
| 512 | * This structure refers to "Traffic Indication Map information element" | ||
| 513 | */ | ||
| 514 | struct ieee80211_tim_ie { | ||
| 515 | u8 dtim_count; | ||
| 516 | u8 dtim_period; | ||
| 517 | u8 bitmap_ctrl; | ||
| 518 | /* variable size: 1 - 251 bytes */ | ||
| 519 | u8 virtual_map[0]; | ||
| 520 | } __attribute__ ((packed)); | ||
| 521 | |||
| 509 | struct ieee80211_mgmt { | 522 | struct ieee80211_mgmt { |
| 510 | __le16 frame_control; | 523 | __le16 frame_control; |
| 511 | __le16 duration; | 524 | __le16 duration; |
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index b52721008be8..9d99f2e0a204 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
| @@ -177,9 +177,10 @@ enum ieee80211_bss_change { | |||
| 177 | * @aid: association ID number, valid only when @assoc is true | 177 | * @aid: association ID number, valid only when @assoc is true |
| 178 | * @use_cts_prot: use CTS protection | 178 | * @use_cts_prot: use CTS protection |
| 179 | * @use_short_preamble: use 802.11b short preamble | 179 | * @use_short_preamble: use 802.11b short preamble |
| 180 | * @dtim_period: num of beacons before the next DTIM, for PSM | ||
| 180 | * @timestamp: beacon timestamp | 181 | * @timestamp: beacon timestamp |
| 181 | * @beacon_int: beacon interval | 182 | * @beacon_int: beacon interval |
| 182 | * @assoc_capability: capabbilities taken from assoc resp | 183 | * @assoc_capability: capabilities taken from assoc resp |
| 183 | * @assoc_ht: association in HT mode | 184 | * @assoc_ht: association in HT mode |
| 184 | * @ht_conf: ht capabilities | 185 | * @ht_conf: ht capabilities |
| 185 | * @ht_bss_conf: ht extended capabilities | 186 | * @ht_bss_conf: ht extended capabilities |
| @@ -191,6 +192,7 @@ struct ieee80211_bss_conf { | |||
| 191 | /* erp related data */ | 192 | /* erp related data */ |
| 192 | bool use_cts_prot; | 193 | bool use_cts_prot; |
| 193 | bool use_short_preamble; | 194 | bool use_short_preamble; |
| 195 | u8 dtim_period; | ||
| 194 | u16 beacon_int; | 196 | u16 beacon_int; |
| 195 | u16 assoc_capability; | 197 | u16 assoc_capability; |
| 196 | u64 timestamp; | 198 | u64 timestamp; |
