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

diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index 1b3304454356..3757298c5a60 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@ -465,8 +465,10 @@ static void ieee80211_sta_tx(struct net_device *dev, struct sk_buff *skb,
         pkt_data = (struct ieee80211_tx_packet_data *) skb->cb;
         memset(pkt_data, 0, sizeof(struct ieee80211_tx_packet_data));
         pkt_data->ifindex = sdata->dev->ifindex;
-        pkt_data->mgmt_iface = (sdata->type == IEEE80211_IF_TYPE_MGMT);
-        pkt_data->do_not_encrypt = !encrypt;
+        if (sdata->type == IEEE80211_IF_TYPE_MGMT)
+                pkt_data->flags |= IEEE80211_TXPD_MGMT_IFACE;
+        if (!encrypt)
+                pkt_data->flags |= IEEE80211_TXPD_DO_NOT_ENCRYPT;
 
         dev_queue_xmit(skb);
 }