summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPawel Kulakowski <pawel.kulakowski@tieto.com>2014-04-01 07:13:21 +0200
committerJohannes Berg <johannes.berg@intel.com>2014-04-09 10:56:00 +0200
commita2e7495d639baeb4692ae80539963cf35dbcb467 (patch)
treeb46a331b6aa5f1c88b0c28030e38f5bf648bb2eb
parent65d26f29ec018c863ae181c96c1dd91ed8c4b652 (diff)
mac80211: Allow disabling LDPC
This allows user-space (wpa_supplicant) to disable LDPC coding. Signed-off-by: Pawel Kulakowski <pawel.kulakowski@tieto.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--net/mac80211/ht.c4
-rw-r--r--net/mac80211/main.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c
index c150b68436d7..1495b9e39484 100644
--- a/net/mac80211/ht.c
+++ b/net/mac80211/ht.c
@@ -86,6 +86,10 @@ void ieee80211_apply_htcap_overrides(struct ieee80211_sub_if_data *sdata,
__check_htcap_disable(ht_capa, ht_capa_mask, ht_cap,
IEEE80211_HT_CAP_MAX_AMSDU);
+ /* Allow user to disable LDPC */
+ __check_htcap_disable(ht_capa, ht_capa_mask, ht_cap,
+ IEEE80211_HT_CAP_LDPC_CODING);
+
/* Allow user to decrease AMPDU factor */
if (ht_capa_mask->ampdu_params_info &
IEEE80211_HT_AMPDU_PARM_FACTOR) {
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index b055f6a55c68..cfc24e912947 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -444,7 +444,8 @@ static const struct ieee80211_ht_cap mac80211_ht_capa_mod_mask = {
.cap_info = cpu_to_le16(IEEE80211_HT_CAP_SUP_WIDTH_20_40 |
IEEE80211_HT_CAP_MAX_AMSDU |
IEEE80211_HT_CAP_SGI_20 |
- IEEE80211_HT_CAP_SGI_40),
+ IEEE80211_HT_CAP_SGI_40 |
+ IEEE80211_HT_CAP_LDPC_CODING),
.mcs = {
.rx_mask = { 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, },