P2P: For now, do not use channels 12-14 in P2P groups
authorJouni Malinen <jouni.malinen@atheros.com>
Fri, 30 Jul 2010 23:33:40 +0000 (16:33 -0700)
committerJouni Malinen <j@w1.fi>
Thu, 9 Sep 2010 14:17:21 +0000 (07:17 -0700)
This is needed to make sure we do not try to accidentally enable GO
in channels that may not be allowed. In addition, this may help with
some driver that do not like channel 14 even as a passive scan
channel.

wpa_supplicant/p2p_supplicant.c

index 93c23e3..e8f002e 100644 (file)
@@ -1927,16 +1927,24 @@ static int wpas_p2p_setup_channels(struct wpa_supplicant *wpa_s,
 
                /* Operating class 81 - 2.4 GHz band channels 1..13 */
                p2p->channels.reg_class[cla].reg_class = 81;
+#if 0
                p2p->channels.reg_class[cla].channels = 13;
                for (i = 0; i < 13; i++)
                        p2p->channels.reg_class[cla].channel[i] = i + 1;
+#else
+               p2p->channels.reg_class[cla].channels = 11;
+               for (i = 0; i < 11; i++)
+                       p2p->channels.reg_class[cla].channel[i] = i + 1;
+#endif
                cla++;
 
+#if 0
                /* Operating class 82 - 2.4 GHz band channel 14 */
                p2p->channels.reg_class[cla].reg_class = 82;
                p2p->channels.reg_class[cla].channels = 1;
                p2p->channels.reg_class[cla].channel[0] = 14;
                cla++;
+#endif
 
 #if 0
                /* Operating class 83 - 2.4 GHz band channels 1..9; 40 MHz */