]> Pileus Git - ~andy/linux/commitdiff
mac80211: Push the deleted comment to correct place
authorAshok Nagarajan <ashok@cozybit.com>
Tue, 8 May 2012 04:00:29 +0000 (21:00 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 16 May 2012 17:24:24 +0000 (13:24 -0400)
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 <ashok@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/mac80211/ibss.c

index bb1a3e62a66a8cd059d0105b15f3045542634344..11ac1ffd957027db44f52aa560bf6d974bdeffab 100644 (file)
@@ -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);
        }