Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

[linux-2.6-microblaze.git] / include / net / mac80211.h

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index aa14580..77e6b5a 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1004,12 +1004,11 @@ ieee80211_rate_get_vht_nss(const struct ieee80211_tx_rate *rate)
 struct ieee80211_tx_info {
        /* common information */
        u32 flags;
-       u8 band;
-
-       u8 hw_queue;
-
-       u16 ack_frame_id:6;
-       u16 tx_time_est:10;
+       u32 band:3,
+           ack_frame_id:13,
+           hw_queue:4,
+           tx_time_est:10;
+       /* 2 free bits */
 
        union {
                struct {