2008-11-14 11:00:43

by Sujith

[permalink] [raw]
Subject: [PATCH] mac80211: Use the HT capabilities from the IE instead of the station's caps.

Signed-off-by: Sujith <[email protected]>
---
net/mac80211/ht.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c
index 0ffbe12..ece79ae 100644
--- a/net/mac80211/ht.c
+++ b/net/mac80211/ht.c
@@ -36,7 +36,7 @@ void ieee80211_ht_cap_ie_to_sta_ht_cap(struct ieee80211_supported_band *sband,

ht_cap->ht_supported = true;

- ht_cap->cap = ht_cap->cap & sband->ht_cap.cap;
+ ht_cap->cap = le16_to_cpu(ht_cap_ie->cap_info) & sband->ht_cap.cap;
ht_cap->cap &= ~IEEE80211_HT_CAP_SM_PS;
ht_cap->cap |= sband->ht_cap.cap & IEEE80211_HT_CAP_SM_PS;

--
1.6.0.3



2008-11-14 11:03:33

by Johannes Berg

[permalink] [raw]
Subject: Re: [PATCH] mac80211: Use the HT capabilities from the IE instead of the station's caps.

On Fri, 2008-11-14 at 16:27 +0530, Sujith wrote:
> Signed-off-by: Sujith <[email protected]>

Thanks.

Acked-by: Johannes Berg <[email protected]>

> ---
> net/mac80211/ht.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c
> index 0ffbe12..ece79ae 100644
> --- a/net/mac80211/ht.c
> +++ b/net/mac80211/ht.c
> @@ -36,7 +36,7 @@ void ieee80211_ht_cap_ie_to_sta_ht_cap(struct ieee80211_supported_band *sband,
>
> ht_cap->ht_supported = true;
>
> - ht_cap->cap = ht_cap->cap & sband->ht_cap.cap;
> + ht_cap->cap = le16_to_cpu(ht_cap_ie->cap_info) & sband->ht_cap.cap;
> ht_cap->cap &= ~IEEE80211_HT_CAP_SM_PS;
> ht_cap->cap |= sband->ht_cap.cap & IEEE80211_HT_CAP_SM_PS;
>


Attachments:
signature.asc (836.00 B)
This is a digitally signed message part