| Message ID | 1563288088-2821-1-git-send-email-srirrama@codeaurora.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 2d7490549ec1c4b36415c0ea2c80e0e5e6a6e853 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | ath11k: Fix warnings that trigger during peer assoc when fixed rate is set | expand |
Sriram R <srirrama@codeaurora.org> wrote: > When VHT fixed rate is set to MCS < 7, warnings are seen when a new sta > gets associated while peer_assoc command is sent to firmware. This is > seen since we expect tx_mcs_set sent to firmware as values corresponding > to range 0-7, 0-8 or 0-9. Since the intersection of STA's VHT MCS support > and current bitrate mask after fixed rate is set has MCS < 7 warning is > thrown currently. > Remove these warning for these cases as it's a valid scenario. > For these cases, 0-7 MCS can be sent during peer assoc to firmware as > this is followed by peer fixed rate setting. > > Signed-off-by: Sriram R <srirrama@codeaurora.org> > Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Patch applied to ath11k-bringup branch of ath.git, thanks. 2d7490549ec1 ath11k: Fix warnings that trigger during peer assoc when fixed rate is set
diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c index 3dc0615..b8217e9 100644 --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c @@ -1007,12 +1007,6 @@ ath11k_peer_assoc_h_vht_limit(u16 tx_mcs_set, case 4: /* fall through */ case 5: /* fall through */ case 6: /* fall through */ - default: - WARN_ON(1); - /* fall through */ - case -1: - mcs = IEEE80211_VHT_MCS_NOT_SUPPORTED; - break; case 7: mcs = IEEE80211_VHT_MCS_SUPPORT_0_7; break; @@ -1022,6 +1016,12 @@ ath11k_peer_assoc_h_vht_limit(u16 tx_mcs_set, case 9: mcs = IEEE80211_VHT_MCS_SUPPORT_0_9; break; + default: + WARN_ON(1); + /* fall through */ + case -1: + mcs = IEEE80211_VHT_MCS_NOT_SUPPORTED; + break; } tx_mcs_set &= ~(0x3 << (nss * 2));
When VHT fixed rate is set to MCS < 7, warnings are seen when a new sta gets associated while peer_assoc command is sent to firmware. This is seen since we expect tx_mcs_set sent to firmware as values corresponding to range 0-7, 0-8 or 0-9. Since the intersection of STA's VHT MCS support and current bitrate mask after fixed rate is set has MCS < 7 warning is thrown currently. Remove these warning for these cases as it's a valid scenario. For these cases, 0-7 MCS can be sent during peer assoc to firmware as this is followed by peer fixed rate setting. Signed-off-by: Sriram R <srirrama@codeaurora.org> --- drivers/net/wireless/ath/ath11k/mac.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)