2019-04-09 12:11:28

by Johannes Berg

Subject: [PATCH v2] mac80211: fix RX STBC override byte order

From: Johannes Berg <[email protected]>

The original patch neglected to take byte order conversions
into account, fix that.

Fixes: d9bb410888ce ("mac80211: allow overriding HT STBC capabilities")
Signed-off-by: Johannes Berg <[email protected]>
---
net/mac80211/ht.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c
index e03c46ac8e4d..c62101857b9b 100644
--- a/net/mac80211/ht.c
+++ b/net/mac80211/ht.c
@@ -112,8 +112,9 @@ void ieee80211_apply_htcap_overrides(struct ieee80211_sub_if_data *sdata,
IEEE80211_HT_CAP_TX_STBC);

/* Allow user to configure RX STBC bits */
- if (ht_capa_mask->cap_info & IEEE80211_HT_CAP_RX_STBC)
- ht_cap->cap |= ht_capa->cap_info & IEEE80211_HT_CAP_RX_STBC;
+ if (ht_capa_mask->cap_info & cpu_to_le16(IEEE80211_HT_CAP_RX_STBC))
+ ht_cap->cap |= le16_to_cpu(ht_capa->cap_info) &
+ IEEE80211_HT_CAP_RX_STBC;

/* Allow user to decrease AMPDU factor */
if (ht_capa_mask->ampdu_params_info &
--
2.17.2

2019-04-09 14:56:12

by Sergey Matyukevich

Subject: Re: [PATCH v2] mac80211: fix RX STBC override byte order

> The original patch neglected to take byte order conversions
> into account, fix that.
>
> Fixes: d9bb410888ce ("mac80211: allow overriding HT STBC capabilities")
> Signed-off-by: Johannes Berg <[email protected]>
> ---
> net/mac80211/ht.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c
> index e03c46ac8e4d..c62101857b9b 100644
> --- a/net/mac80211/ht.c
> +++ b/net/mac80211/ht.c
> @@ -112,8 +112,9 @@ void ieee80211_apply_htcap_overrides(struct ieee80211_sub_if_data *sdata,
> IEEE80211_HT_CAP_TX_STBC);
>
> /* Allow user to configure RX STBC bits */
> - if (ht_capa_mask->cap_info & IEEE80211_HT_CAP_RX_STBC)
> - ht_cap->cap |= ht_capa->cap_info & IEEE80211_HT_CAP_RX_STBC;
> + if (ht_capa_mask->cap_info & cpu_to_le16(IEEE80211_HT_CAP_RX_STBC))
> + ht_cap->cap |= le16_to_cpu(ht_capa->cap_info) &
> + IEEE80211_HT_CAP_RX_STBC;
>
> /* Allow user to decrease AMPDU factor */
> if (ht_capa_mask->ampdu_params_info &

Thanks for fixing this!

Reviewed-by: Sergey Matyukevich <[email protected]>

Regards,
Sergey