Commit 81338410 authored by Johannes Berg's avatar Johannes Berg

mac80211_hwsim: minimize rctbl module parameter usage

Check the flag that the module parameter sets instead, so
later radios can use different parameters.
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent e4afb603
...@@ -802,7 +802,7 @@ static void mac80211_hwsim_tx(struct ieee80211_hw *hw, ...@@ -802,7 +802,7 @@ static void mac80211_hwsim_tx(struct ieee80211_hw *hw,
if (control->sta) if (control->sta)
hwsim_check_sta_magic(control->sta); hwsim_check_sta_magic(control->sta);
if (rctbl) if (hw->flags & IEEE80211_HW_SUPPORTS_RC_TABLE)
ieee80211_get_tx_rates(txi->control.vif, control->sta, skb, ieee80211_get_tx_rates(txi->control.vif, control->sta, skb,
txi->control.rates, txi->control.rates,
ARRAY_SIZE(txi->control.rates)); ARRAY_SIZE(txi->control.rates));
...@@ -909,7 +909,7 @@ static void mac80211_hwsim_tx_frame(struct ieee80211_hw *hw, ...@@ -909,7 +909,7 @@ static void mac80211_hwsim_tx_frame(struct ieee80211_hw *hw,
{ {
u32 _pid = ACCESS_ONCE(wmediumd_portid); u32 _pid = ACCESS_ONCE(wmediumd_portid);
if (rctbl) { if (hw->flags & IEEE80211_HW_SUPPORTS_RC_TABLE) {
struct ieee80211_tx_info *txi = IEEE80211_SKB_CB(skb); struct ieee80211_tx_info *txi = IEEE80211_SKB_CB(skb);
ieee80211_get_tx_rates(txi->control.vif, NULL, skb, ieee80211_get_tx_rates(txi->control.vif, NULL, skb,
txi->control.rates, txi->control.rates,
...@@ -946,7 +946,7 @@ static void mac80211_hwsim_beacon_tx(void *arg, u8 *mac, ...@@ -946,7 +946,7 @@ static void mac80211_hwsim_beacon_tx(void *arg, u8 *mac,
if (skb == NULL) if (skb == NULL)
return; return;
info = IEEE80211_SKB_CB(skb); info = IEEE80211_SKB_CB(skb);
if (rctbl) if (hw->flags & IEEE80211_HW_SUPPORTS_RC_TABLE)
ieee80211_get_tx_rates(vif, NULL, skb, ieee80211_get_tx_rates(vif, NULL, skb,
info->control.rates, info->control.rates,
ARRAY_SIZE(info->control.rates)); ARRAY_SIZE(info->control.rates));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment