merge in klp-factoryrom-release history after reset to klp-release
diff --git a/src/p2p/p2p_utils.c b/src/p2p/p2p_utils.c
index e0d3756..deb7aa9 100644
--- a/src/p2p/p2p_utils.c
+++ b/src/p2p/p2p_utils.c
@@ -247,12 +247,6 @@
int p2p_supported_freq(struct p2p_data *p2p, unsigned int freq)
{
u8 op_reg_class, op_channel;
-
-#ifdef ANDROID_P2P
- if ((freq >= 5170 && freq < 5745) &&
- (os_strncasecmp(p2p->cfg->country, "US", 2) == 0))
- return 0;
-#endif
if (p2p_freq_to_channel(freq, &op_reg_class, &op_channel) < 0)
return 0;
return p2p_channels_includes(&p2p->cfg->channels, op_reg_class,
diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index af57afa..8736b07 100644
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -5150,19 +5150,8 @@
int ret;
ret = wpa_drv_driver_cmd(wpa_s, cmd, buf, buflen);
- if (ret == 0) {
- if (os_strncasecmp(cmd, "COUNTRY", 7) == 0) {
- struct p2p_data *p2p = wpa_s->global->p2p;
- if (p2p) {
- char country[3];
- country[0] = cmd[8];
- country[1] = cmd[9];
- country[2] = 0x04;
- p2p_set_country(p2p, country);
- }
- }
+ if (ret == 0)
ret = sprintf(buf, "%s\n", "OK");
- }
return ret;
}
#endif