diff mbox

mac80211: Allow disabling LDPC

Message ID 1396329202-2549-1-git-send-email-pawel.kulakowski@tieto.com (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Pawel Kulakowski April 1, 2014, 5:13 a.m. UTC 
This allows user-space (wpa_supplicant) to disable LDPC coding.

Signed-off-by: Pawel Kulakowski <pawel.kulakowski@tieto.com>
---
 net/mac80211/ht.c   |    4 ++++
 net/mac80211/main.c |    3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

Comments

Johannes Berg April 8, 2014, 8:39 a.m. UTC | #1 
On Tue, 2014-04-01 at 07:13 +0200, Pawel Kulakowski wrote:
> This allows user-space (wpa_supplicant) to disable LDPC coding.

Applied.

johannes

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c
index c150b68..1495b9e 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 b055f6a5..cfc24e9 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, },