From: Ashok Nagarajan Date: Tue, 8 May 2012 04:00:29 +0000 (-0700) Subject: mac80211: Push the deleted comment to correct place X-Git-Tag: v3.5-rc1~101^2~6^2^2~4 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0d894ec5017f7f463254e24fd2206e41d13cadff;p=karo-tx-linux.git mac80211: Push the deleted comment to correct place This comment is deleted in the patch "mac80211: Advertise HT protection mode in IEs". Moving the comment to the now corrected place. Signed-off-by: Ashok Nagarajan Signed-off-by: John W. Linville --- diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index bb1a3e62a66a..11ac1ffd9570 100644 --- 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); }