aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/mac80211.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/net/mac80211.h')
-rw-r--r--include/net/mac80211.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index e0b1ff9a3148..16c895969e6e 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -99,7 +99,7 @@ enum ieee80211_max_queues {
99 * The information provided in this structure is required for QoS 99 * The information provided in this structure is required for QoS
100 * transmit queue configuration. Cf. IEEE 802.11 7.3.2.29. 100 * transmit queue configuration. Cf. IEEE 802.11 7.3.2.29.
101 * 101 *
102 * @aifs: arbitration interface space [0..255] 102 * @aifs: arbitration interframe space [0..255]
103 * @cw_min: minimum contention window [a value of the form 103 * @cw_min: minimum contention window [a value of the form
104 * 2^n-1 in the range 1..32767] 104 * 2^n-1 in the range 1..32767]
105 * @cw_max: maximum contention window [like @cw_min] 105 * @cw_max: maximum contention window [like @cw_min]
@@ -950,7 +950,7 @@ static inline void SET_IEEE80211_DEV(struct ieee80211_hw *hw, struct device *dev
950} 950}
951 951
952/** 952/**
953 * SET_IEEE80211_PERM_ADDR - set the permanenet MAC address for 802.11 hardware 953 * SET_IEEE80211_PERM_ADDR - set the permanent MAC address for 802.11 hardware
954 * 954 *
955 * @hw: the &struct ieee80211_hw to set the MAC address for 955 * @hw: the &struct ieee80211_hw to set the MAC address for
956 * @addr: the address to set 956 * @addr: the address to set
@@ -1043,7 +1043,7 @@ ieee80211_get_alt_retry_rate(const struct ieee80211_hw *hw,
1043 * This happens everytime the iv16 wraps around (every 65536 packets). The 1043 * This happens everytime the iv16 wraps around (every 65536 packets). The
1044 * set_key() call will happen only once for each key (unless the AP did 1044 * set_key() call will happen only once for each key (unless the AP did
1045 * rekeying), it will not include a valid phase 1 key. The valid phase 1 key is 1045 * rekeying), it will not include a valid phase 1 key. The valid phase 1 key is
1046 * provided by udpate_tkip_key only. The trigger that makes mac80211 call this 1046 * provided by update_tkip_key only. The trigger that makes mac80211 call this
1047 * handler is software decryption with wrap around of iv16. 1047 * handler is software decryption with wrap around of iv16.
1048 */ 1048 */
1049 1049
@@ -1177,7 +1177,7 @@ enum ieee80211_ampdu_mlme_action {
1177 * Must be implemented. 1177 * Must be implemented.
1178 * 1178 *
1179 * @add_interface: Called when a netdevice attached to the hardware is 1179 * @add_interface: Called when a netdevice attached to the hardware is
1180 * enabled. Because it is not called for monitor mode devices, @open 1180 * enabled. Because it is not called for monitor mode devices, @start
1181 * and @stop must be implemented. 1181 * and @stop must be implemented.
1182 * The driver should perform any initialization it needs before 1182 * The driver should perform any initialization it needs before
1183 * the device can be enabled. The initial configuration for the 1183 * the device can be enabled. The initial configuration for the
@@ -1244,7 +1244,7 @@ enum ieee80211_ampdu_mlme_action {
1244 * the stack will not do fragmentation. 1244 * the stack will not do fragmentation.
1245 * 1245 *
1246 * @sta_notify: Notifies low level driver about addition or removal 1246 * @sta_notify: Notifies low level driver about addition or removal
1247 * of assocaited station or AP. 1247 * of associated station or AP.
1248 * 1248 *
1249 * @conf_tx: Configure TX queue parameters (EDCF (aifs, cw_min, cw_max), 1249 * @conf_tx: Configure TX queue parameters (EDCF (aifs, cw_min, cw_max),
1250 * bursting) for a hardware TX queue. 1250 * bursting) for a hardware TX queue.
@@ -1544,7 +1544,7 @@ void ieee80211_tx_status_irqsafe(struct ieee80211_hw *hw,
1544 * the next beacon frame from the 802.11 code. The low-level is responsible 1544 * the next beacon frame from the 802.11 code. The low-level is responsible
1545 * for calling this function before beacon data is needed (e.g., based on 1545 * for calling this function before beacon data is needed (e.g., based on
1546 * hardware interrupt). Returned skb is used only once and low-level driver 1546 * hardware interrupt). Returned skb is used only once and low-level driver
1547 * is responsible of freeing it. 1547 * is responsible for freeing it.
1548 */ 1548 */
1549struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw, 1549struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw,
1550 struct ieee80211_vif *vif); 1550 struct ieee80211_vif *vif);