[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, 9 insertions, 4 deletions

diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 8f472379b128..289b33ce45cf 100644
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -876,10 +876,15 @@ static void ieee80211_remove_tx_extra(struct ieee80211_local *local,
 
         pkt_data = (struct ieee80211_tx_packet_data *)skb->cb;
         pkt_data->ifindex = control->ifindex;
-        pkt_data->mgmt_iface = (control->type == IEEE80211_IF_TYPE_MGMT);
-        pkt_data->req_tx_status = !!(control->flags & IEEE80211_TXCTL_REQ_TX_STATUS);
-        pkt_data->do_not_encrypt = !!(control->flags & IEEE80211_TXCTL_DO_NOT_ENCRYPT);
-        pkt_data->requeue = !!(control->flags & IEEE80211_TXCTL_REQUEUE);
+        pkt_data->flags = 0;
+        if (control->flags & IEEE80211_TXCTL_REQ_TX_STATUS)
+                pkt_data->flags |= IEEE80211_TXPD_REQ_TX_STATUS;
+        if (control->flags & IEEE80211_TXCTL_DO_NOT_ENCRYPT)
+                pkt_data->flags |= IEEE80211_TXPD_DO_NOT_ENCRYPT;
+        if (control->flags & IEEE80211_TXCTL_REQUEUE)
+                pkt_data->flags |= IEEE80211_TXPD_REQUEUE;
+        if (control->type == IEEE80211_IF_TYPE_MGMT)
+                pkt_data->flags |= IEEE80211_TXPD_MGMT_IFACE;
         pkt_data->queue = control->queue;
 
         hdrlen = ieee80211_get_hdrlen_from_skb(skb);