[MAC80211]: Remove bitfields from struct ieee80211_sub_if_data

mac80211, remove bitfields from struct ieee80211_sub_if_data

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, 3 insertions, 3 deletions

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 091ac0d634a5..07686bda26cd 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -329,7 +329,7 @@ __le16 ieee80211_generic_frame_duration(struct ieee80211_hw *hw, int if_id,
         sdata = IEEE80211_DEV_TO_SUB_IF(bdev);
         erp = ieee80211_is_erp_rate(hw->conf.phymode, rate);
         dur = ieee80211_frame_duration(local, frame_len, rate,
-                                       erp, sdata->short_preamble);
+                       erp, sdata->flags & IEEE80211_SDATA_SHORT_PREAMBLE);
 
         dev_put(bdev);
         return cpu_to_le16(dur);
@@ -352,7 +352,7 @@ __le16 ieee80211_rts_duration(struct ieee80211_hw *hw, int if_id,
                 return 0;
 
         sdata = IEEE80211_DEV_TO_SUB_IF(bdev);
-        short_preamble = sdata->short_preamble;
+        short_preamble = sdata->flags & IEEE80211_SDATA_SHORT_PREAMBLE;
 
         rate = frame_txctl->rts_rate;
         erp = !!(rate->flags & IEEE80211_RATE_ERP);
@@ -388,7 +388,7 @@ __le16 ieee80211_ctstoself_duration(struct ieee80211_hw *hw, int if_id,
                 return 0;
 
         sdata = IEEE80211_DEV_TO_SUB_IF(bdev);
-        short_preamble = sdata->short_preamble;
+        short_preamble = sdata->flags & IEEE80211_SDATA_SHORT_PREAMBLE;
 
         rate = frame_txctl->rts_rate;
         erp = !!(rate->flags & IEEE80211_RATE_ERP);