aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAhmad Kholaif <akholaif@qca.qualcomm.com>2015-10-28 21:14:10 +0000
committerAnjaneedevi Kapparapu <akappa@codeaurora.org>2016-04-01 16:52:19 +0530
commit087bb32b287508169d28cf5ea11d7344f1420571 (patch)
tree71206a28c8cd342f111dad84a944332d82d329cf
parent6ea5af00beb889ba3ea3d28608f89651ee49d8de (diff)
downloadandroid_external_wpa_supplicant_8-087bb32b287508169d28cf5ea11d7344f1420571.tar.gz
android_external_wpa_supplicant_8-087bb32b287508169d28cf5ea11d7344f1420571.tar.bz2
android_external_wpa_supplicant_8-087bb32b287508169d28cf5ea11d7344f1420571.zip
P2P: Define operating classes for VHT 80+80 and 160
This adds definitions for the global operating classes 129 and 130 for VHT 80+80 MHz and 160 MHz use cases. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com> Git-commit: 5e1da9c8fdcadb0171d5448fa09960f976804155 Git-repo : git://w1.fi/srv/git/hostap.git Change-Id: Ifb4dfec7e7f6fa4dac125260c488195562e2c170 CRs-Fixed: 944221
-rw-r--r--src/p2p/p2p.h2
-rw-r--r--src/p2p/p2p_go_neg.c2
-rw-r--r--wpa_supplicant/p2p_supplicant.c4
3 files changed, 5 insertions, 3 deletions
diff --git a/src/p2p/p2p.h b/src/p2p/p2p.h
index ca53aebd..4add69ac 100644
--- a/src/p2p/p2p.h
+++ b/src/p2p/p2p.h
@@ -30,7 +30,7 @@
/**
* P2P_MAX_REG_CLASSES - Maximum number of regulatory classes
*/
-#define P2P_MAX_REG_CLASSES 10
+#define P2P_MAX_REG_CLASSES 15
/**
* P2P_MAX_REG_CLASS_CHANNELS - Maximum number of channels per regulatory class
diff --git a/src/p2p/p2p_go_neg.c b/src/p2p/p2p_go_neg.c
index ef142d4e..3929979b 100644
--- a/src/p2p/p2p_go_neg.c
+++ b/src/p2p/p2p_go_neg.c
@@ -384,7 +384,7 @@ void p2p_reselect_channel(struct p2p_data *p2p,
unsigned int i;
const int op_classes_5ghz[] = { 124, 125, 115, 0 };
const int op_classes_ht40[] = { 126, 127, 116, 117, 0 };
- const int op_classes_vht[] = { 128, 0 };
+ const int op_classes_vht[] = { 128, 129, 130, 0 };
if (p2p->own_freq_preference > 0 &&
p2p_freq_to_channel(p2p->own_freq_preference,
diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index b2fd8db2..93efe9a0 100644
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -3130,7 +3130,7 @@ struct p2p_oper_class_map {
u8 min_chan;
u8 max_chan;
u8 inc;
- enum { BW20, BW40PLUS, BW40MINUS, BW80, BW2160 } bw;
+ enum { BW20, BW40PLUS, BW40MINUS, BW80, BW2160, BW160, BW80P80 } bw;
};
static const struct p2p_oper_class_map op_class[] = {
@@ -3156,6 +3156,8 @@ static const struct p2p_oper_class_map op_class[] = {
* removing invalid channels.
*/
{ HOSTAPD_MODE_IEEE80211A, 128, 36, 161, 4, BW80 },
+ { HOSTAPD_MODE_IEEE80211A, 130, 36, 161, 4, BW80P80 },
+ { HOSTAPD_MODE_IEEE80211A, 129, 50, 114, 16, BW160 },
{ HOSTAPD_MODE_IEEE80211AD, 180, 1, 4, 1, BW2160 },
{ -1, 0, 0, 0, 0, BW20 }
};