Commit ad96bc27 authored by Joseph Chuang's avatar Joseph Chuang Committed by Kalle Valo

brcmfmac: initialize the requested dwell time

Commit 4905432b28b7 ("brcmfmac: Fix P2P Group Formation failure via Go-neg
method") did not initialize requested_dwell properly, resulting in an
always-false dwell time overflow check. Fix it by setting the correct
requested_dwell value.

Fixes: 4905432b28b7 ("brcmfmac: Fix P2P Group Formation failure via Go-neg method")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarJoseph Chuang <joseph.chuang@cypress.com>
Signed-off-by: default avatarChi-Hsien Lin <chi-hsien.lin@cypress.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200610152106.175257-7-chi-hsien.lin@cypress.com
parent bbf7ae3d
...@@ -5129,7 +5129,7 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, ...@@ -5129,7 +5129,7 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
&freq); &freq);
chan_nr = ieee80211_frequency_to_channel(freq); chan_nr = ieee80211_frequency_to_channel(freq);
af_params->channel = cpu_to_le32(chan_nr); af_params->channel = cpu_to_le32(chan_nr);
af_params->dwell_time = cpu_to_le32(params->wait);
memcpy(action_frame->data, &buf[DOT11_MGMT_HDR_LEN], memcpy(action_frame->data, &buf[DOT11_MGMT_HDR_LEN],
le16_to_cpu(action_frame->len)); le16_to_cpu(action_frame->len));
......
...@@ -1700,7 +1700,7 @@ static s32 brcmf_p2p_pub_af_tx(struct brcmf_cfg80211_info *cfg, ...@@ -1700,7 +1700,7 @@ static s32 brcmf_p2p_pub_af_tx(struct brcmf_cfg80211_info *cfg,
return err; return err;
} }
static bool brcmf_p2p_check_dwell_overflow(s32 requested_dwell, static bool brcmf_p2p_check_dwell_overflow(u32 requested_dwell,
unsigned long dwell_jiffies) unsigned long dwell_jiffies)
{ {
if ((requested_dwell & CUSTOM_RETRY_MASK) && if ((requested_dwell & CUSTOM_RETRY_MASK) &&
...@@ -1738,8 +1738,7 @@ bool brcmf_p2p_send_action_frame(struct brcmf_cfg80211_info *cfg, ...@@ -1738,8 +1738,7 @@ bool brcmf_p2p_send_action_frame(struct brcmf_cfg80211_info *cfg,
unsigned long dwell_jiffies = 0; unsigned long dwell_jiffies = 0;
bool dwell_overflow = false; bool dwell_overflow = false;
s32 requested_dwell = af_params->dwell_time; u32 requested_dwell = le32_to_cpu(af_params->dwell_time);
action_frame = &af_params->action_frame; action_frame = &af_params->action_frame;
action_frame_len = le16_to_cpu(action_frame->len); action_frame_len = le16_to_cpu(action_frame->len);
......
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