summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2014-03-13 14:30:47 +0200
committerJohannes Berg <johannes.berg@intel.com>2014-03-19 21:29:55 +0100
commita0f995a561d90636120bce2e89157b537a174c92 (patch)
tree371197132d85c66eb9696517b024b2111190391a /include
parent71228a1eabaf7fa4b2c3060cfee60875254cec14 (diff)
downloadlinux-stable-a0f995a561d90636120bce2e89157b537a174c92.tar.gz
linux-stable-a0f995a561d90636120bce2e89157b537a174c92.tar.bz2
linux-stable-a0f995a561d90636120bce2e89157b537a174c92.zip
mac80211: add status_driver_data array to ieee80211_tx_info
Drivers might want to have private data in addition to all other ieee80211_tx_info.status fields. The current ieee80211_tx_info.rate_driver_data overlaps with some of the non-rate data (e.g. ampdu_ack_len), so it might not be good enough. Since we already know how much free bytes remained, simply use this size to define (void *) array. While on it, change ack_signal type from int to the more explicit s32 type. Signed-off-by: Eliad Peller <eliadx.peller@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include')
-rw-r--r--include/net/mac80211.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 86faa413b37d..f6988fe8dfd2 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -697,11 +697,11 @@ struct ieee80211_tx_info {
} control;
struct {
struct ieee80211_tx_rate rates[IEEE80211_TX_MAX_RATES];
- int ack_signal;
+ s32 ack_signal;
u8 ampdu_ack_len;
u8 ampdu_len;
u8 antenna;
- /* 21 bytes free */
+ void *status_driver_data[21 / sizeof(void *)];
} status;
struct {
struct ieee80211_tx_rate driver_rates[