Commit 69188df5 authored by Jonas Jelonek's avatar Jonas Jelonek Committed by Johannes Berg
Browse files

wifi: mac80211_hwsim: fix debugfs attribute ps with rc table support 



Fixes a warning that occurs when rc table support is enabled
(IEEE80211_HW_SUPPORTS_RC_TABLE) in mac80211_hwsim and the PS mode
is changed via the exported debugfs attribute.

When the PS mode is changed, a packet is broadcasted via
hwsim_send_nullfunc by creating and transmitting a plain skb with only
header initialized. The ieee80211 rate array in the control buffer is
zero-initialized. When ratetbl support is enabled, ieee80211_get_tx_rates
is called for the skb with sta parameter set to NULL and thus no
ratetbl can be used. The final rate array then looks like
[-1,0; 0,0; 0,0; 0,0] which causes the warning in ieee80211_get_tx_rate.

The issue is fixed by setting the count of the first rate with idx '0'
to 1 and hence ieee80211_get_tx_rates won't overwrite it with idx '-1'.

Signed-off-by: default avatarJonas Jelonek <jelonek.jonas@gmail.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 18429c51

drivers/net/wireless/mac80211_hwsim.c

+5 −0
Original line number Diff line number Diff line
@@ -910,6 +910,7 @@ static void hwsim_send_nullfunc(struct mac80211_hwsim_data *data, u8 *mac, 
	struct hwsim_vif_priv *vp = (void *)vif->drv_priv;

	struct sk_buff *skb;

	struct ieee80211_hdr *hdr;

	struct ieee80211_tx_info *cb;



	if (!vp->assoc)

		return;
@@ -931,6 +932,10 @@ static void hwsim_send_nullfunc(struct mac80211_hwsim_data *data, u8 *mac, 
	memcpy(hdr->addr2, mac, ETH_ALEN);

	memcpy(hdr->addr3, vp->bssid, ETH_ALEN);



	cb = IEEE80211_SKB_CB(skb);

	cb->control.rates[0].count = 1;

	cb->control.rates[1].idx = -1;



	rcu_read_lock();

	mac80211_hwsim_tx_frame(data->hw, skb,

				rcu_dereference(vif->bss_conf.chanctx_conf)->def.chan);