Merge tag 'please-pull-mce' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras

[karo-tx-linux.git] / net / mac80211 / ibss.c

diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index 3ad33a8246240dcedb94a0d433c9a29f64110362..33d9d0c3e3d06ce70e831643473dc34ac201deed 100644 (file)
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -163,6 +163,11 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
                                   sizeof(struct ieee80211_ht_operation));
                pos = ieee80211_ie_build_ht_cap(pos, &sband->ht_cap,
                                                sband->ht_cap.cap);
+               /*
+                * Note: According to 802.11n-2009 9.13.3.1, HT Protection
+                * field and RIFS Mode are reserved in IBSS mode, therefore
+                * keep them at 0
+                */
                pos = ieee80211_ie_build_ht_oper(pos, &sband->ht_cap,
                                                 chan, channel_type, 0);
        }