From 678fa9ba58f8035860d78b2f9dd5eb318eafc244 Mon Sep 17 00:00:00 2001 From: Shahar Levi Date: Sun, 13 Mar 2011 11:24:40 +0200 Subject: [PATCH] --- yaml --- r: 247101 b: refs/heads/master c: 871d0c3ba32c2d2e1e7d9ac0d231a440d2653fc5 h: refs/heads/master i: 247099: 9a54510cfe7b7877876bc75834bfb4a647707a12 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl12xx/main.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 93519bbb55bf..e04d335a8d44 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0af0467f09207cbbeb387d2e09ea539534c6655c +refs/heads/master: 871d0c3ba32c2d2e1e7d9ac0d231a440d2653fc5 diff --git a/trunk/drivers/net/wireless/wl12xx/main.c b/trunk/drivers/net/wireless/wl12xx/main.c index db7ab856363e..28048474827a 100644 --- a/trunk/drivers/net/wireless/wl12xx/main.c +++ b/trunk/drivers/net/wireless/wl12xx/main.c @@ -3132,7 +3132,8 @@ static const u8 wl1271_rate_to_idx_2ghz[] = { #ifdef CONFIG_WL12XX_HT #define WL12XX_HT_CAP { \ - .cap = IEEE80211_HT_CAP_GRN_FLD | IEEE80211_HT_CAP_SGI_20, \ + .cap = IEEE80211_HT_CAP_GRN_FLD | IEEE80211_HT_CAP_SGI_20 | \ + (1 << IEEE80211_HT_CAP_RX_STBC_SHIFT), \ .ht_supported = true, \ .ampdu_factor = IEEE80211_HT_MAX_AMPDU_8K, \ .ampdu_density = IEEE80211_HT_MPDU_DENSITY_8, \