From: Eliad Peller Date: Thu, 13 Mar 2014 12:30:47 +0000 (+0200) Subject: mac80211: add status_driver_data array to ieee80211_tx_info X-Git-Tag: v3.15-rc1~113^2~93^2^2~5^2~5 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a0f995a561d90636120bce2e89157b537a174c92;p=~emulex%2Finfiniband.git 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 Signed-off-by: Johannes Berg --- diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 86faa413b37..f6988fe8dfd 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[