diff options
| author | Jiri Slaby <jirislaby@gmail.com> | 2007-08-28 17:01:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 16:48:50 -0700 |
| commit | 13262ffd4902805acad2618c12b41fcaa6c50791 (patch) | |
| tree | 2c5c250435c8464aa4c36253b3a86804e3a54814 /net/mac80211/util.c | |
| parent | d6f2da5b33911a31eb61e1790ef8e555e9605837 (diff) | |
[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>
Diffstat (limited to 'net/mac80211/util.c')
| -rw-r--r-- | net/mac80211/util.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 091ac0d634a..07686bda26c 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); |