diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-05-15 06:55:29 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-05-21 21:48:11 -0400 |
commit | e039fa4a4195ac4ee895e6f3d1334beed63256fe (patch) | |
tree | cfd0762d73df96b73052378be7b157c4ac6e7035 /include/net/mac80211.h | |
parent | e24549485f859be6518929bb1c9c0257d79f033d (diff) |
mac80211: move TX info into skb->cb
This patch converts mac80211 and all drivers to have transmit
information and status in skb->cb rather than allocating extra
memory for it and copying all the data around. To make it fit,
a union is used where only data that is necessary for all steps
is kept outside of the union.
A number of fixes were done by Ivo, as well as the rt2x00 part
of this patch.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net/mac80211.h')
-rw-r--r-- | include/net/mac80211.h | 299 |
1 files changed, 133 insertions, 166 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 0df91bea6c1f..54960b83db79 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
@@ -201,101 +201,127 @@ struct ieee80211_bss_conf { | |||
201 | }; | 201 | }; |
202 | 202 | ||
203 | /** | 203 | /** |
204 | * enum mac80211_tx_control_flags - flags to describe Tx configuration for | 204 | * enum mac80211_tx_flags - flags to transmission information/status |
205 | * the Tx frame | 205 | * |
206 | * | 206 | * These flags are used with the @flags member of &ieee80211_tx_info |
207 | * These flags are used with the @flags member of &ieee80211_tx_control | 207 | * |
208 | * | 208 | * @IEEE80211_TX_CTL_REQ_TX_STATUS: request TX status callback for this frame. |
209 | * @IEEE80211_TXCTL_REQ_TX_STATUS: request TX status callback for this frame. | 209 | * @IEEE80211_TX_CTL_DO_NOT_ENCRYPT: send this frame without encryption; |
210 | * @IEEE80211_TXCTL_DO_NOT_ENCRYPT: send this frame without encryption; | 210 | * e.g., for EAPOL frame |
211 | * e.g., for EAPOL frame | 211 | * @IEEE80211_TX_CTL_USE_RTS_CTS: use RTS-CTS before sending frame |
212 | * @IEEE80211_TXCTL_USE_RTS_CTS: use RTS-CTS before sending frame | 212 | * @IEEE80211_TX_CTL_USE_CTS_PROTECT: use CTS protection for the frame (e.g., |
213 | * @IEEE80211_TXCTL_USE_CTS_PROTECT: use CTS protection for the frame (e.g., | 213 | * for combined 802.11g / 802.11b networks) |
214 | * for combined 802.11g / 802.11b networks) | 214 | * @IEEE80211_TX_CTL_NO_ACK: tell the low level not to wait for an ack |
215 | * @IEEE80211_TXCTL_NO_ACK: tell the low level not to wait for an ack | 215 | * @IEEE80211_TX_CTL_RATE_CTRL_PROBE |
216 | * @IEEE80211_TXCTL_RATE_CTRL_PROBE | 216 | * @IEEE80211_TX_CTL_CLEAR_PS_FILT: clear powersave filter for destination |
217 | * @EEE80211_TXCTL_CLEAR_PS_FILT: clear powersave filter | 217 | * station |
218 | * for destination station | 218 | * @IEEE80211_TX_CTL_REQUEUE: |
219 | * @IEEE80211_TXCTL_REQUEUE: | 219 | * @IEEE80211_TX_CTL_FIRST_FRAGMENT: this is a first fragment of the frame |
220 | * @IEEE80211_TXCTL_FIRST_FRAGMENT: this is a first fragment of the frame | 220 | * @IEEE80211_TX_CTL_LONG_RETRY_LIMIT: this frame should be send using the |
221 | * @IEEE80211_TXCTL_LONG_RETRY_LIMIT: this frame should be send using the | 221 | * through set_retry_limit configured long retry value |
222 | * through set_retry_limit configured long | 222 | * @IEEE80211_TX_CTL_EAPOL_FRAME: internal to mac80211 |
223 | * retry value | 223 | * @IEEE80211_TX_CTL_SEND_AFTER_DTIM: send this frame after DTIM beacon |
224 | * @IEEE80211_TXCTL_EAPOL_FRAME: internal to mac80211 | 224 | * @IEEE80211_TX_CTL_AMPDU: this frame should be sent as part of an A-MPDU |
225 | * @IEEE80211_TXCTL_SEND_AFTER_DTIM: send this frame after DTIM beacon | 225 | * @IEEE80211_TX_CTL_OFDM_HT: this frame can be sent in HT OFDM rates. number |
226 | * @IEEE80211_TXCTL_AMPDU: this frame should be sent as part of an A-MPDU | 226 | * of streams when this flag is on can be extracted from antenna_sel_tx, |
227 | * @IEEE80211_TXCTL_OFDM_HT: this frame can be sent in HT OFDM rates. number | 227 | * so if 1 antenna is marked use SISO, 2 antennas marked use MIMO, n |
228 | * of streams when this flag is on can be extracted | 228 | * antennas marked use MIMO_n. |
229 | * from antenna_sel_tx, so if 1 antenna is marked | 229 | * @IEEE80211_TX_CTL_GREEN_FIELD: use green field protection for this frame |
230 | * use SISO, 2 antennas marked use MIMO, n antennas | 230 | * @IEEE80211_TX_CTL_40_MHZ_WIDTH: send this frame using 40 Mhz channel width |
231 | * marked use MIMO_n. | 231 | * @IEEE80211_TX_CTL_DUP_DATA: duplicate data frame on both 20 Mhz channels |
232 | * @IEEE80211_TXCTL_GREEN_FIELD: use green field protection for this frame | 232 | * @IEEE80211_TX_CTL_SHORT_GI: send this frame using short guard interval |
233 | * @IEEE80211_TXCTL_40_MHZ_WIDTH: send this frame using 40 Mhz channel width | 233 | * @IEEE80211_TX_STAT_TX_FILTERED: The frame was not transmitted |
234 | * @IEEE80211_TXCTL_DUP_DATA: duplicate data frame on both 20 Mhz channels | 234 | * because the destination STA was in powersave mode. |
235 | * @IEEE80211_TXCTL_SHORT_GI: send this frame using short guard interval | 235 | * @IEEE80211_TX_STAT_ACK: Frame was acknowledged |
236 | * @IEEE80211_TX_STAT_AMPDU: The frame was aggregated, so status | ||
237 | * is for the whole aggregation. | ||
236 | */ | 238 | */ |
237 | enum mac80211_tx_control_flags { | 239 | enum mac80211_tx_control_flags { |
238 | IEEE80211_TXCTL_REQ_TX_STATUS = (1<<0), | 240 | IEEE80211_TX_CTL_REQ_TX_STATUS = BIT(0), |
239 | IEEE80211_TXCTL_DO_NOT_ENCRYPT = (1<<1), | 241 | IEEE80211_TX_CTL_DO_NOT_ENCRYPT = BIT(1), |
240 | IEEE80211_TXCTL_USE_RTS_CTS = (1<<2), | 242 | IEEE80211_TX_CTL_USE_RTS_CTS = BIT(2), |
241 | IEEE80211_TXCTL_USE_CTS_PROTECT = (1<<3), | 243 | IEEE80211_TX_CTL_USE_CTS_PROTECT = BIT(3), |
242 | IEEE80211_TXCTL_NO_ACK = (1<<4), | 244 | IEEE80211_TX_CTL_NO_ACK = BIT(4), |
243 | IEEE80211_TXCTL_RATE_CTRL_PROBE = (1<<5), | 245 | IEEE80211_TX_CTL_RATE_CTRL_PROBE = BIT(5), |
244 | IEEE80211_TXCTL_CLEAR_PS_FILT = (1<<6), | 246 | IEEE80211_TX_CTL_CLEAR_PS_FILT = BIT(6), |
245 | IEEE80211_TXCTL_REQUEUE = (1<<7), | 247 | IEEE80211_TX_CTL_REQUEUE = BIT(7), |
246 | IEEE80211_TXCTL_FIRST_FRAGMENT = (1<<8), | 248 | IEEE80211_TX_CTL_FIRST_FRAGMENT = BIT(8), |
247 | IEEE80211_TXCTL_SHORT_PREAMBLE = (1<<9), | 249 | IEEE80211_TX_CTL_SHORT_PREAMBLE = BIT(9), |
248 | IEEE80211_TXCTL_LONG_RETRY_LIMIT = (1<<10), | 250 | IEEE80211_TX_CTL_LONG_RETRY_LIMIT = BIT(10), |
249 | IEEE80211_TXCTL_EAPOL_FRAME = (1<<11), | 251 | IEEE80211_TX_CTL_EAPOL_FRAME = BIT(11), |
250 | IEEE80211_TXCTL_SEND_AFTER_DTIM = (1<<12), | 252 | IEEE80211_TX_CTL_SEND_AFTER_DTIM = BIT(12), |
251 | IEEE80211_TXCTL_AMPDU = (1<<13), | 253 | IEEE80211_TX_CTL_AMPDU = BIT(13), |
252 | IEEE80211_TXCTL_OFDM_HT = (1<<14), | 254 | IEEE80211_TX_CTL_OFDM_HT = BIT(14), |
253 | IEEE80211_TXCTL_GREEN_FIELD = (1<<15), | 255 | IEEE80211_TX_CTL_GREEN_FIELD = BIT(15), |
254 | IEEE80211_TXCTL_40_MHZ_WIDTH = (1<<16), | 256 | IEEE80211_TX_CTL_40_MHZ_WIDTH = BIT(16), |
255 | IEEE80211_TXCTL_DUP_DATA = (1<<17), | 257 | IEEE80211_TX_CTL_DUP_DATA = BIT(17), |
256 | IEEE80211_TXCTL_SHORT_GI = (1<<18), | 258 | IEEE80211_TX_CTL_SHORT_GI = BIT(18), |
259 | IEEE80211_TX_CTL_INJECTED = BIT(19), | ||
260 | IEEE80211_TX_STAT_TX_FILTERED = BIT(20), | ||
261 | IEEE80211_TX_STAT_ACK = BIT(21), | ||
262 | IEEE80211_TX_STAT_AMPDU = BIT(22), | ||
257 | }; | 263 | }; |
258 | 264 | ||
259 | /* Transmit control fields. This data structure is passed to low-level driver | ||
260 | * with each TX frame. The low-level driver is responsible for configuring | ||
261 | * the hardware to use given values (depending on what is supported). | ||
262 | * | ||
263 | * NOTE: Be careful with using the pointers outside of the ieee80211_ops->tx() | ||
264 | * context (i.e. when defering the work to a workqueue). | ||
265 | * The vif pointer is valid until the it has been removed with the | ||
266 | * ieee80211_ops->remove_interface() callback funtion. | ||
267 | * The hw_key pointer is valid until it has been removed with the | ||
268 | * ieee80211_ops->set_key() callback function. | ||
269 | */ | ||
270 | struct ieee80211_tx_control { | ||
271 | u32 flags; /* tx control flags defined above */ | ||
272 | |||
273 | s8 tx_rate_idx, /* Transmit rate (indexes registered rates) */ | ||
274 | rts_cts_rate_idx, /* Transmit rate for RTS/CTS frame */ | ||
275 | alt_retry_rate_idx; /* retry rate for the last retries */ | ||
276 | |||
277 | s8 retry_limit; /* 1 = only first attempt, 2 = one retry, .. | ||
278 | * This could be used when set_retry_limit | ||
279 | * is not implemented by the driver */ | ||
280 | 265 | ||
281 | struct ieee80211_vif *vif; | 266 | #define IEEE80211_TX_INFO_DRIVER_DATA_SIZE \ |
282 | 267 | (sizeof(((struct sk_buff *)0)->cb) - 8) | |
283 | /* Key used for hardware encryption | 268 | #define IEEE80211_TX_INFO_DRIVER_DATA_PTRS \ |
284 | * NULL if IEEE80211_TXCTL_DO_NOT_ENCRYPT is set */ | 269 | (IEEE80211_TX_INFO_DRIVER_DATA_SIZE / sizeof(void *)) |
285 | struct ieee80211_key_conf *hw_key; | ||
286 | 270 | ||
287 | enum ieee80211_band band; | 271 | /** |
272 | * struct ieee80211_tx_info - skb transmit information | ||
273 | * | ||
274 | * This structure is placed in skb->cb for three uses: | ||
275 | * (1) mac80211 TX control - mac80211 tells the driver what to do | ||
276 | * (2) driver internal use (if applicable) | ||
277 | * (3) TX status information - driver tells mac80211 what happened | ||
278 | * | ||
279 | * @flags: transmit info flags, defined above | ||
280 | * @retry_count: number of retries | ||
281 | * @excessive_retries: set to 1 if the frame was retried many times | ||
282 | * but not acknowledged | ||
283 | * @ampdu_ack_len: number of aggregated frames. | ||
284 | * relevant only if IEEE80211_TX_STATUS_AMPDU was set. | ||
285 | * @ampdu_ack_map: block ack bit map for the aggregation. | ||
286 | * relevant only if IEEE80211_TX_STATUS_AMPDU was set. | ||
287 | * @ack_signal: signal strength of the ACK frame | ||
288 | */ | ||
289 | struct ieee80211_tx_info { | ||
290 | /* common information */ | ||
291 | u32 flags; | ||
292 | u8 band; | ||
293 | s8 tx_rate_idx; | ||
294 | u8 antenna_sel_tx; | ||
288 | 295 | ||
289 | u8 antenna_sel_tx; /* 0 = default/diversity, otherwise bit | 296 | u8 queue; /* use skb_queue_mapping soon */ |
290 | * position represents antenna number used */ | 297 | |
291 | u8 icv_len; /* length of the ICV/MIC field in octets */ | 298 | union { |
292 | u8 iv_len; /* length of the IV field in octets */ | 299 | struct { |
293 | u16 queue; /* hardware queue to use for this frame; | 300 | struct ieee80211_vif *vif; |
294 | * 0 = highest, hw->queues-1 = lowest */ | 301 | struct ieee80211_key_conf *hw_key; |
295 | u16 aid; /* Station AID */ | 302 | unsigned long jiffies; |
296 | int type; /* internal */ | 303 | int ifindex; |
304 | u16 aid; | ||
305 | s8 rts_cts_rate_idx, alt_retry_rate_idx; | ||
306 | u8 retry_limit; | ||
307 | u8 icv_len; | ||
308 | u8 iv_len; | ||
309 | } control; | ||
310 | struct { | ||
311 | u64 ampdu_ack_map; | ||
312 | int ack_signal; | ||
313 | u8 retry_count; | ||
314 | bool excessive_retries; | ||
315 | u8 ampdu_ack_len; | ||
316 | } status; | ||
317 | void *driver_data[IEEE80211_TX_INFO_DRIVER_DATA_PTRS]; | ||
318 | }; | ||
297 | }; | 319 | }; |
298 | 320 | ||
321 | static inline struct ieee80211_tx_info *IEEE80211_SKB_CB(struct sk_buff *skb) | ||
322 | { | ||
323 | return (struct ieee80211_tx_info *)skb->cb; | ||
324 | } | ||
299 | 325 | ||
300 | 326 | ||
301 | /** | 327 | /** |
@@ -363,52 +389,6 @@ struct ieee80211_rx_status { | |||
363 | }; | 389 | }; |
364 | 390 | ||
365 | /** | 391 | /** |
366 | * enum ieee80211_tx_status_flags - transmit status flags | ||
367 | * | ||
368 | * Status flags to indicate various transmit conditions. | ||
369 | * | ||
370 | * @IEEE80211_TX_STATUS_TX_FILTERED: The frame was not transmitted | ||
371 | * because the destination STA was in powersave mode. | ||
372 | * @IEEE80211_TX_STATUS_ACK: Frame was acknowledged | ||
373 | * @IEEE80211_TX_STATUS_AMPDU: The frame was aggregated, so status | ||
374 | * is for the whole aggregation. | ||
375 | */ | ||
376 | enum ieee80211_tx_status_flags { | ||
377 | IEEE80211_TX_STATUS_TX_FILTERED = 1<<0, | ||
378 | IEEE80211_TX_STATUS_ACK = 1<<1, | ||
379 | IEEE80211_TX_STATUS_AMPDU = 1<<2, | ||
380 | }; | ||
381 | |||
382 | /** | ||
383 | * struct ieee80211_tx_status - transmit status | ||
384 | * | ||
385 | * As much information as possible should be provided for each transmitted | ||
386 | * frame with ieee80211_tx_status(). | ||
387 | * | ||
388 | * @control: a copy of the &struct ieee80211_tx_control passed to the driver | ||
389 | * in the tx() callback. | ||
390 | * @flags: transmit status flags, defined above | ||
391 | * @retry_count: number of retries | ||
392 | * @excessive_retries: set to 1 if the frame was retried many times | ||
393 | * but not acknowledged | ||
394 | * @ampdu_ack_len: number of aggregated frames. | ||
395 | * relevant only if IEEE80211_TX_STATUS_AMPDU was set. | ||
396 | * @ampdu_ack_map: block ack bit map for the aggregation. | ||
397 | * relevant only if IEEE80211_TX_STATUS_AMPDU was set. | ||
398 | * @ack_signal: signal strength of the ACK frame either in dBm, dB or unspec | ||
399 | * depending on hardware capabilites flags @IEEE80211_HW_SIGNAL_* | ||
400 | */ | ||
401 | struct ieee80211_tx_status { | ||
402 | struct ieee80211_tx_control control; | ||
403 | u8 flags; | ||
404 | u8 retry_count; | ||
405 | bool excessive_retries; | ||
406 | u8 ampdu_ack_len; | ||
407 | u64 ampdu_ack_map; | ||
408 | int ack_signal; | ||
409 | }; | ||
410 | |||
411 | /** | ||
412 | * enum ieee80211_conf_flags - configuration flags | 392 | * enum ieee80211_conf_flags - configuration flags |
413 | * | 393 | * |
414 | * Flags to define PHY configuration options | 394 | * Flags to define PHY configuration options |
@@ -563,7 +543,6 @@ struct ieee80211_if_conf { | |||
563 | u8 *ssid; | 543 | u8 *ssid; |
564 | size_t ssid_len; | 544 | size_t ssid_len; |
565 | struct sk_buff *beacon; | 545 | struct sk_buff *beacon; |
566 | struct ieee80211_tx_control *beacon_control; | ||
567 | }; | 546 | }; |
568 | 547 | ||
569 | /** | 548 | /** |
@@ -825,7 +804,7 @@ static inline void SET_IEEE80211_PERM_ADDR(struct ieee80211_hw *hw, u8 *addr) | |||
825 | 804 | ||
826 | static inline struct ieee80211_rate * | 805 | static inline struct ieee80211_rate * |
827 | ieee80211_get_tx_rate(const struct ieee80211_hw *hw, | 806 | ieee80211_get_tx_rate(const struct ieee80211_hw *hw, |
828 | const struct ieee80211_tx_control *c) | 807 | const struct ieee80211_tx_info *c) |
829 | { | 808 | { |
830 | if (WARN_ON(c->tx_rate_idx < 0)) | 809 | if (WARN_ON(c->tx_rate_idx < 0)) |
831 | return NULL; | 810 | return NULL; |
@@ -834,20 +813,20 @@ ieee80211_get_tx_rate(const struct ieee80211_hw *hw, | |||
834 | 813 | ||
835 | static inline struct ieee80211_rate * | 814 | static inline struct ieee80211_rate * |
836 | ieee80211_get_rts_cts_rate(const struct ieee80211_hw *hw, | 815 | ieee80211_get_rts_cts_rate(const struct ieee80211_hw *hw, |
837 | const struct ieee80211_tx_control *c) | 816 | const struct ieee80211_tx_info *c) |
838 | { | 817 | { |
839 | if (c->rts_cts_rate_idx < 0) | 818 | if (c->control.rts_cts_rate_idx < 0) |
840 | return NULL; | 819 | return NULL; |
841 | return &hw->wiphy->bands[c->band]->bitrates[c->rts_cts_rate_idx]; | 820 | return &hw->wiphy->bands[c->band]->bitrates[c->control.rts_cts_rate_idx]; |
842 | } | 821 | } |
843 | 822 | ||
844 | static inline struct ieee80211_rate * | 823 | static inline struct ieee80211_rate * |
845 | ieee80211_get_alt_retry_rate(const struct ieee80211_hw *hw, | 824 | ieee80211_get_alt_retry_rate(const struct ieee80211_hw *hw, |
846 | const struct ieee80211_tx_control *c) | 825 | const struct ieee80211_tx_info *c) |
847 | { | 826 | { |
848 | if (c->alt_retry_rate_idx < 0) | 827 | if (c->control.alt_retry_rate_idx < 0) |
849 | return NULL; | 828 | return NULL; |
850 | return &hw->wiphy->bands[c->band]->bitrates[c->alt_retry_rate_idx]; | 829 | return &hw->wiphy->bands[c->band]->bitrates[c->control.alt_retry_rate_idx]; |
851 | } | 830 | } |
852 | 831 | ||
853 | /** | 832 | /** |
@@ -1142,8 +1121,7 @@ enum ieee80211_ampdu_mlme_action { | |||
1142 | * that TX/RX_STOP can pass NULL for this parameter. | 1121 | * that TX/RX_STOP can pass NULL for this parameter. |
1143 | */ | 1122 | */ |
1144 | struct ieee80211_ops { | 1123 | struct ieee80211_ops { |
1145 | int (*tx)(struct ieee80211_hw *hw, struct sk_buff *skb, | 1124 | int (*tx)(struct ieee80211_hw *hw, struct sk_buff *skb); |
1146 | struct ieee80211_tx_control *control); | ||
1147 | int (*start)(struct ieee80211_hw *hw); | 1125 | int (*start)(struct ieee80211_hw *hw); |
1148 | void (*stop)(struct ieee80211_hw *hw); | 1126 | void (*stop)(struct ieee80211_hw *hw); |
1149 | int (*add_interface)(struct ieee80211_hw *hw, | 1127 | int (*add_interface)(struct ieee80211_hw *hw, |
@@ -1187,8 +1165,7 @@ struct ieee80211_ops { | |||
1187 | u64 (*get_tsf)(struct ieee80211_hw *hw); | 1165 | u64 (*get_tsf)(struct ieee80211_hw *hw); |
1188 | void (*reset_tsf)(struct ieee80211_hw *hw); | 1166 | void (*reset_tsf)(struct ieee80211_hw *hw); |
1189 | int (*beacon_update)(struct ieee80211_hw *hw, | 1167 | int (*beacon_update)(struct ieee80211_hw *hw, |
1190 | struct sk_buff *skb, | 1168 | struct sk_buff *skb); |
1191 | struct ieee80211_tx_control *control); | ||
1192 | int (*tx_last_beacon)(struct ieee80211_hw *hw); | 1169 | int (*tx_last_beacon)(struct ieee80211_hw *hw); |
1193 | int (*ampdu_action)(struct ieee80211_hw *hw, | 1170 | int (*ampdu_action)(struct ieee80211_hw *hw, |
1194 | enum ieee80211_ampdu_mlme_action action, | 1171 | enum ieee80211_ampdu_mlme_action action, |
@@ -1384,13 +1361,9 @@ void ieee80211_rx_irqsafe(struct ieee80211_hw *hw, | |||
1384 | * | 1361 | * |
1385 | * @hw: the hardware the frame was transmitted by | 1362 | * @hw: the hardware the frame was transmitted by |
1386 | * @skb: the frame that was transmitted, owned by mac80211 after this call | 1363 | * @skb: the frame that was transmitted, owned by mac80211 after this call |
1387 | * @status: status information for this frame; the status pointer need not | ||
1388 | * be valid after this function returns and is not freed by mac80211, | ||
1389 | * it is recommended that it points to a stack area | ||
1390 | */ | 1364 | */ |
1391 | void ieee80211_tx_status(struct ieee80211_hw *hw, | 1365 | void ieee80211_tx_status(struct ieee80211_hw *hw, |
1392 | struct sk_buff *skb, | 1366 | struct sk_buff *skb); |
1393 | struct ieee80211_tx_status *status); | ||
1394 | 1367 | ||
1395 | /** | 1368 | /** |
1396 | * ieee80211_tx_status_irqsafe - irq-safe transmit status callback | 1369 | * ieee80211_tx_status_irqsafe - irq-safe transmit status callback |
@@ -1403,13 +1376,9 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, | |||
1403 | * | 1376 | * |
1404 | * @hw: the hardware the frame was transmitted by | 1377 | * @hw: the hardware the frame was transmitted by |
1405 | * @skb: the frame that was transmitted, owned by mac80211 after this call | 1378 | * @skb: the frame that was transmitted, owned by mac80211 after this call |
1406 | * @status: status information for this frame; the status pointer need not | ||
1407 | * be valid after this function returns and is not freed by mac80211, | ||
1408 | * it is recommended that it points to a stack area | ||
1409 | */ | 1379 | */ |
1410 | void ieee80211_tx_status_irqsafe(struct ieee80211_hw *hw, | 1380 | void ieee80211_tx_status_irqsafe(struct ieee80211_hw *hw, |
1411 | struct sk_buff *skb, | 1381 | struct sk_buff *skb); |
1412 | struct ieee80211_tx_status *status); | ||
1413 | 1382 | ||
1414 | /** | 1383 | /** |
1415 | * ieee80211_beacon_get - beacon generation function | 1384 | * ieee80211_beacon_get - beacon generation function |
@@ -1425,8 +1394,7 @@ void ieee80211_tx_status_irqsafe(struct ieee80211_hw *hw, | |||
1425 | * is responsible of freeing it. | 1394 | * is responsible of freeing it. |
1426 | */ | 1395 | */ |
1427 | struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw, | 1396 | struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw, |
1428 | struct ieee80211_vif *vif, | 1397 | struct ieee80211_vif *vif); |
1429 | struct ieee80211_tx_control *control); | ||
1430 | 1398 | ||
1431 | /** | 1399 | /** |
1432 | * ieee80211_rts_get - RTS frame generation function | 1400 | * ieee80211_rts_get - RTS frame generation function |
@@ -1434,7 +1402,7 @@ struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw, | |||
1434 | * @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf. | 1402 | * @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf. |
1435 | * @frame: pointer to the frame that is going to be protected by the RTS. | 1403 | * @frame: pointer to the frame that is going to be protected by the RTS. |
1436 | * @frame_len: the frame length (in octets). | 1404 | * @frame_len: the frame length (in octets). |
1437 | * @frame_txctl: &struct ieee80211_tx_control of the frame. | 1405 | * @frame_txctl: &struct ieee80211_tx_info of the frame. |
1438 | * @rts: The buffer where to store the RTS frame. | 1406 | * @rts: The buffer where to store the RTS frame. |
1439 | * | 1407 | * |
1440 | * If the RTS frames are generated by the host system (i.e., not in | 1408 | * If the RTS frames are generated by the host system (i.e., not in |
@@ -1444,7 +1412,7 @@ struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw, | |||
1444 | */ | 1412 | */ |
1445 | void ieee80211_rts_get(struct ieee80211_hw *hw, struct ieee80211_vif *vif, | 1413 | void ieee80211_rts_get(struct ieee80211_hw *hw, struct ieee80211_vif *vif, |
1446 | const void *frame, size_t frame_len, | 1414 | const void *frame, size_t frame_len, |
1447 | const struct ieee80211_tx_control *frame_txctl, | 1415 | const struct ieee80211_tx_info *frame_txctl, |
1448 | struct ieee80211_rts *rts); | 1416 | struct ieee80211_rts *rts); |
1449 | 1417 | ||
1450 | /** | 1418 | /** |
@@ -1452,7 +1420,7 @@ void ieee80211_rts_get(struct ieee80211_hw *hw, struct ieee80211_vif *vif, | |||
1452 | * @hw: pointer obtained from ieee80211_alloc_hw(). | 1420 | * @hw: pointer obtained from ieee80211_alloc_hw(). |
1453 | * @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf. | 1421 | * @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf. |
1454 | * @frame_len: the length of the frame that is going to be protected by the RTS. | 1422 | * @frame_len: the length of the frame that is going to be protected by the RTS. |
1455 | * @frame_txctl: &struct ieee80211_tx_control of the frame. | 1423 | * @frame_txctl: &struct ieee80211_tx_info of the frame. |
1456 | * | 1424 | * |
1457 | * If the RTS is generated in firmware, but the host system must provide | 1425 | * If the RTS is generated in firmware, but the host system must provide |
1458 | * the duration field, the low-level driver uses this function to receive | 1426 | * the duration field, the low-level driver uses this function to receive |
@@ -1460,7 +1428,7 @@ void ieee80211_rts_get(struct ieee80211_hw *hw, struct ieee80211_vif *vif, | |||
1460 | */ | 1428 | */ |
1461 | __le16 ieee80211_rts_duration(struct ieee80211_hw *hw, | 1429 | __le16 ieee80211_rts_duration(struct ieee80211_hw *hw, |
1462 | struct ieee80211_vif *vif, size_t frame_len, | 1430 | struct ieee80211_vif *vif, size_t frame_len, |
1463 | const struct ieee80211_tx_control *frame_txctl); | 1431 | const struct ieee80211_tx_info *frame_txctl); |
1464 | 1432 | ||
1465 | /** | 1433 | /** |
1466 | * ieee80211_ctstoself_get - CTS-to-self frame generation function | 1434 | * ieee80211_ctstoself_get - CTS-to-self frame generation function |
@@ -1468,7 +1436,7 @@ __le16 ieee80211_rts_duration(struct ieee80211_hw *hw, | |||
1468 | * @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf. | 1436 | * @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf. |
1469 | * @frame: pointer to the frame that is going to be protected by the CTS-to-self. | 1437 | * @frame: pointer to the frame that is going to be protected by the CTS-to-self. |
1470 | * @frame_len: the frame length (in octets). | 1438 | * @frame_len: the frame length (in octets). |
1471 | * @frame_txctl: &struct ieee80211_tx_control of the frame. | 1439 | * @frame_txctl: &struct ieee80211_tx_info of the frame. |
1472 | * @cts: The buffer where to store the CTS-to-self frame. | 1440 | * @cts: The buffer where to store the CTS-to-self frame. |
1473 | * | 1441 | * |
1474 | * If the CTS-to-self frames are generated by the host system (i.e., not in | 1442 | * If the CTS-to-self frames are generated by the host system (i.e., not in |
@@ -1479,7 +1447,7 @@ __le16 ieee80211_rts_duration(struct ieee80211_hw *hw, | |||
1479 | void ieee80211_ctstoself_get(struct ieee80211_hw *hw, | 1447 | void ieee80211_ctstoself_get(struct ieee80211_hw *hw, |
1480 | struct ieee80211_vif *vif, | 1448 | struct ieee80211_vif *vif, |
1481 | const void *frame, size_t frame_len, | 1449 | const void *frame, size_t frame_len, |
1482 | const struct ieee80211_tx_control *frame_txctl, | 1450 | const struct ieee80211_tx_info *frame_txctl, |
1483 | struct ieee80211_cts *cts); | 1451 | struct ieee80211_cts *cts); |
1484 | 1452 | ||
1485 | /** | 1453 | /** |
@@ -1487,7 +1455,7 @@ void ieee80211_ctstoself_get(struct ieee80211_hw *hw, | |||
1487 | * @hw: pointer obtained from ieee80211_alloc_hw(). | 1455 | * @hw: pointer obtained from ieee80211_alloc_hw(). |
1488 | * @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf. | 1456 | * @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf. |
1489 | * @frame_len: the length of the frame that is going to be protected by the CTS-to-self. | 1457 | * @frame_len: the length of the frame that is going to be protected by the CTS-to-self. |
1490 | * @frame_txctl: &struct ieee80211_tx_control of the frame. | 1458 | * @frame_txctl: &struct ieee80211_tx_info of the frame. |
1491 | * | 1459 | * |
1492 | * If the CTS-to-self is generated in firmware, but the host system must provide | 1460 | * If the CTS-to-self is generated in firmware, but the host system must provide |
1493 | * the duration field, the low-level driver uses this function to receive | 1461 | * the duration field, the low-level driver uses this function to receive |
@@ -1496,7 +1464,7 @@ void ieee80211_ctstoself_get(struct ieee80211_hw *hw, | |||
1496 | __le16 ieee80211_ctstoself_duration(struct ieee80211_hw *hw, | 1464 | __le16 ieee80211_ctstoself_duration(struct ieee80211_hw *hw, |
1497 | struct ieee80211_vif *vif, | 1465 | struct ieee80211_vif *vif, |
1498 | size_t frame_len, | 1466 | size_t frame_len, |
1499 | const struct ieee80211_tx_control *frame_txctl); | 1467 | const struct ieee80211_tx_info *frame_txctl); |
1500 | 1468 | ||
1501 | /** | 1469 | /** |
1502 | * ieee80211_generic_frame_duration - Calculate the duration field for a frame | 1470 | * ieee80211_generic_frame_duration - Calculate the duration field for a frame |
@@ -1535,8 +1503,7 @@ __le16 ieee80211_generic_frame_duration(struct ieee80211_hw *hw, | |||
1535 | * use common code for all beacons. | 1503 | * use common code for all beacons. |
1536 | */ | 1504 | */ |
1537 | struct sk_buff * | 1505 | struct sk_buff * |
1538 | ieee80211_get_buffered_bc(struct ieee80211_hw *hw, struct ieee80211_vif *vif, | 1506 | ieee80211_get_buffered_bc(struct ieee80211_hw *hw, struct ieee80211_vif *vif); |
1539 | struct ieee80211_tx_control *control); | ||
1540 | 1507 | ||
1541 | /** | 1508 | /** |
1542 | * ieee80211_get_hdrlen_from_skb - get header length from data | 1509 | * ieee80211_get_hdrlen_from_skb - get header length from data |