Cumulative patch from commit 00043740251716e83ca8a01b5b8a2bed1ed02db9

0004374 P2P: Prefer U-NII-3 over U-NII-1 during channel selection
1b665cb P2P: Fix channel preference use for MCC p2p_connect
5624ccf P2P: Optimize default case for own freq preference setting
d0f61a4 P2P: Fix p2p_ignore_shared_freq=1 when inviting a peer
21e491f P2P: Fix p2p_ignore_shared_freq=1 during invitation processing

Change-Id: I79cdeb935ff2eb14ba99b5fc3d364b9399e3f89f
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c
index acd77f2..77c889e 100644
--- a/src/p2p/p2p.c
+++ b/src/p2p/p2p.c
@@ -1236,8 +1236,8 @@
 static void p2p_prepare_channel_best(struct p2p_data *p2p)
 {
 	u8 op_class, op_channel;
-	const int op_classes_5ghz[] = { 115, 124, 0 };
-	const int op_classes_ht40[] = { 116, 117, 126, 127, 0 };
+	const int op_classes_5ghz[] = { 124, 115, 0 };
+	const int op_classes_ht40[] = { 126, 127, 116, 117, 0 };
 	const int op_classes_vht[] = { 128, 0 };
 
 	p2p_dbg(p2p, "Prepare channel best");