[MAC80211]: Remove bitfields from struct ieee80211_tx_packet_data

remove bitfields from struct ieee80211_tx_packet_data

[Johannes: completely clear flags in ieee80211_remove_tx_extra]

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 7 insertions, 5 deletions

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 9c5fd861eb72..a2b018bae180 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -155,15 +155,17 @@ struct ieee80211_txrx_data {
         } u;
 };
 
+/* flags used in struct ieee80211_tx_packet_data.flags */
+#define IEEE80211_TXPD_REQ_TX_STATUS    BIT(0)
+#define IEEE80211_TXPD_DO_NOT_ENCRYPT   BIT(1)
+#define IEEE80211_TXPD_REQUEUE          BIT(2)
+#define IEEE80211_TXPD_MGMT_IFACE       BIT(3)
 /* Stored in sk_buff->cb */
 struct ieee80211_tx_packet_data {
         int ifindex;
         unsigned long jiffies;
-        unsigned int req_tx_status:1;
-        unsigned int do_not_encrypt:1;
-        unsigned int requeue:1;
-        unsigned int mgmt_iface:1;
-        unsigned int queue:4;
+        unsigned int flags;
+        u8 queue;
 };
 
 struct ieee80211_tx_stored_packet {