diff options
Diffstat (limited to 'include/net/mac80211.h')
-rw-r--r-- | include/net/mac80211.h | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index a810dfcb83c2..e2dba93e374f 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
@@ -811,14 +811,18 @@ enum mac80211_rate_control_flags { | |||
811 | * in the control information, and it will be filled by the rate | 811 | * in the control information, and it will be filled by the rate |
812 | * control algorithm according to what should be sent. For example, | 812 | * control algorithm according to what should be sent. For example, |
813 | * if this array contains, in the format { <idx>, <count> } the | 813 | * if this array contains, in the format { <idx>, <count> } the |
814 | * information | 814 | * information:: |
815 | * | ||
815 | * { 3, 2 }, { 2, 2 }, { 1, 4 }, { -1, 0 }, { -1, 0 } | 816 | * { 3, 2 }, { 2, 2 }, { 1, 4 }, { -1, 0 }, { -1, 0 } |
817 | * | ||
816 | * then this means that the frame should be transmitted | 818 | * then this means that the frame should be transmitted |
817 | * up to twice at rate 3, up to twice at rate 2, and up to four | 819 | * up to twice at rate 3, up to twice at rate 2, and up to four |
818 | * times at rate 1 if it doesn't get acknowledged. Say it gets | 820 | * times at rate 1 if it doesn't get acknowledged. Say it gets |
819 | * acknowledged by the peer after the fifth attempt, the status | 821 | * acknowledged by the peer after the fifth attempt, the status |
820 | * information should then contain | 822 | * information should then contain:: |
823 | * | ||
821 | * { 3, 2 }, { 2, 2 }, { 1, 1 }, { -1, 0 } ... | 824 | * { 3, 2 }, { 2, 2 }, { 1, 1 }, { -1, 0 } ... |
825 | * | ||
822 | * since it was transmitted twice at rate 3, twice at rate 2 | 826 | * since it was transmitted twice at rate 3, twice at rate 2 |
823 | * and once at rate 1 after which we received an acknowledgement. | 827 | * and once at rate 1 after which we received an acknowledgement. |
824 | */ | 828 | */ |
@@ -1168,8 +1172,8 @@ enum mac80211_rx_vht_flags { | |||
1168 | * @rate_idx: index of data rate into band's supported rates or MCS index if | 1172 | * @rate_idx: index of data rate into band's supported rates or MCS index if |
1169 | * HT or VHT is used (%RX_FLAG_HT/%RX_FLAG_VHT) | 1173 | * HT or VHT is used (%RX_FLAG_HT/%RX_FLAG_VHT) |
1170 | * @vht_nss: number of streams (VHT only) | 1174 | * @vht_nss: number of streams (VHT only) |
1171 | * @flag: %RX_FLAG_* | 1175 | * @flag: %RX_FLAG_\* |
1172 | * @vht_flag: %RX_VHT_FLAG_* | 1176 | * @vht_flag: %RX_VHT_FLAG_\* |
1173 | * @rx_flags: internal RX flags for mac80211 | 1177 | * @rx_flags: internal RX flags for mac80211 |
1174 | * @ampdu_reference: A-MPDU reference number, must be a different value for | 1178 | * @ampdu_reference: A-MPDU reference number, must be a different value for |
1175 | * each A-MPDU but the same for each subframe within one A-MPDU | 1179 | * each A-MPDU but the same for each subframe within one A-MPDU |
@@ -1432,7 +1436,7 @@ enum ieee80211_vif_flags { | |||
1432 | * @probe_req_reg: probe requests should be reported to mac80211 for this | 1436 | * @probe_req_reg: probe requests should be reported to mac80211 for this |
1433 | * interface. | 1437 | * interface. |
1434 | * @drv_priv: data area for driver use, will always be aligned to | 1438 | * @drv_priv: data area for driver use, will always be aligned to |
1435 | * sizeof(void *). | 1439 | * sizeof(void \*). |
1436 | * @txq: the multicast data TX queue (if driver uses the TXQ abstraction) | 1440 | * @txq: the multicast data TX queue (if driver uses the TXQ abstraction) |
1437 | */ | 1441 | */ |
1438 | struct ieee80211_vif { | 1442 | struct ieee80211_vif { |
@@ -1743,7 +1747,7 @@ struct ieee80211_sta_rates { | |||
1743 | * @wme: indicates whether the STA supports QoS/WME (if local devices does, | 1747 | * @wme: indicates whether the STA supports QoS/WME (if local devices does, |
1744 | * otherwise always false) | 1748 | * otherwise always false) |
1745 | * @drv_priv: data area for driver use, will always be aligned to | 1749 | * @drv_priv: data area for driver use, will always be aligned to |
1746 | * sizeof(void *), size is determined in hw information. | 1750 | * sizeof(void \*), size is determined in hw information. |
1747 | * @uapsd_queues: bitmap of queues configured for uapsd. Only valid | 1751 | * @uapsd_queues: bitmap of queues configured for uapsd. Only valid |
1748 | * if wme is supported. | 1752 | * if wme is supported. |
1749 | * @max_sp: max Service Period. Only valid if wme is supported. | 1753 | * @max_sp: max Service Period. Only valid if wme is supported. |
@@ -2146,12 +2150,12 @@ enum ieee80211_hw_flags { | |||
2146 | * | 2150 | * |
2147 | * @radiotap_mcs_details: lists which MCS information can the HW | 2151 | * @radiotap_mcs_details: lists which MCS information can the HW |
2148 | * reports, by default it is set to _MCS, _GI and _BW but doesn't | 2152 | * reports, by default it is set to _MCS, _GI and _BW but doesn't |
2149 | * include _FMT. Use %IEEE80211_RADIOTAP_MCS_HAVE_* values, only | 2153 | * include _FMT. Use %IEEE80211_RADIOTAP_MCS_HAVE_\* values, only |
2150 | * adding _BW is supported today. | 2154 | * adding _BW is supported today. |
2151 | * | 2155 | * |
2152 | * @radiotap_vht_details: lists which VHT MCS information the HW reports, | 2156 | * @radiotap_vht_details: lists which VHT MCS information the HW reports, |
2153 | * the default is _GI | _BANDWIDTH. | 2157 | * the default is _GI | _BANDWIDTH. |
2154 | * Use the %IEEE80211_RADIOTAP_VHT_KNOWN_* values. | 2158 | * Use the %IEEE80211_RADIOTAP_VHT_KNOWN_\* values. |
2155 | * | 2159 | * |
2156 | * @radiotap_timestamp: Information for the radiotap timestamp field; if the | 2160 | * @radiotap_timestamp: Information for the radiotap timestamp field; if the |
2157 | * 'units_pos' member is set to a non-negative value it must be set to | 2161 | * 'units_pos' member is set to a non-negative value it must be set to |
@@ -2486,6 +2490,7 @@ void ieee80211_free_txskb(struct ieee80211_hw *hw, struct sk_buff *skb); | |||
2486 | * in the software stack cares about, we will, in the future, have mac80211 | 2490 | * in the software stack cares about, we will, in the future, have mac80211 |
2487 | * tell the driver which information elements are interesting in the sense | 2491 | * tell the driver which information elements are interesting in the sense |
2488 | * that we want to see changes in them. This will include | 2492 | * that we want to see changes in them. This will include |
2493 | * | ||
2489 | * - a list of information element IDs | 2494 | * - a list of information element IDs |
2490 | * - a list of OUIs for the vendor information element | 2495 | * - a list of OUIs for the vendor information element |
2491 | * | 2496 | * |