Remove forced frequency for Wi-Fi P2P group

Description: When device doesn't support multi channel concurrent
and connected to Ap, user shouldn't add frequency information for
GruopAdd method. Because wpasupplicant won't selected shared frequency
but it chooses the random chennel if frequecny is given as 2.

P2P: Request to start GO on 2.4 GHz band
P2P: Use random 2.4 GHz band channel: 2412 MHz
p2p0: Determining shared radio frequencies (max len 1)
p2p0: Shared frequencies (len=1): completed iteration
p2p0: freq[0]: 2472, flags=0x1
p2p0: Shared frequencies (len=1): valid for P2P
p2p0: freq[0]: 2472, flags=0x1
p2p0: P2P: Common group frequencies (len=0):
p2p0: Determining shared radio frequencies (max len 1)
p2p0: Shared frequencies (len=1): completed iteration
p2p0: freq[0]: 2472, flags=0x1
p2p0: P2P: num_unused_channels: 0
P2P: Cannot force GO on freq (2412 MHz) as all the channels are in use

Change-Id: I1fd3c2f21c2265ae5e86dfd42220511bfaf78ba6
Signed-off-by: Yu jiung <jiung.yu@samsung.com>

diff --git a/files/wifi-direct-manager.conf.common b/files/wifi-direct-manager.conf.common
index 2945ad1..4165f44 100644 (file)
--- a/files/wifi-direct-manager.conf.common
+++ b/files/wifi-direct-manager.conf.common
@@ -29,4 +29,4 @@ config_methods=display push_button keypad p2ps
 # default no group interface
 no_group_iface=1
 # Group operating frequency
-group_operating_freq=2
+group_operating_freq=0

diff --git a/files/wifi-direct-manager.conf.in b/files/wifi-direct-manager.conf.in
index 3ae1ab3..d8ca2cc 100644 (file)
--- a/files/wifi-direct-manager.conf.in
+++ b/files/wifi-direct-manager.conf.in
@@ -29,4 +29,4 @@ config_methods=display push_button keypad p2ps
 # default no group interface
 no_group_iface=0
 # Group operating frequency
-group_operating_freq=2
+group_operating_freq=0

diff --git a/files/wifi-direct-manager.conf.mobile b/files/wifi-direct-manager.conf.mobile
index f8109c7..62b3053 100644 (file)
--- a/files/wifi-direct-manager.conf.mobile
+++ b/files/wifi-direct-manager.conf.mobile
@@ -30,4 +30,4 @@ config_methods=display push_button keypad p2ps
 # default no group interface
 no_group_iface=0
 # Group operating frequency
-group_operating_freq=2
+group_operating_freq=0

diff --git a/files/wifi-direct-manager.conf.tm1 b/files/wifi-direct-manager.conf.tm1
index 0058d73..23f698c 100644 (file)
--- a/files/wifi-direct-manager.conf.tm1
+++ b/files/wifi-direct-manager.conf.tm1
@@ -30,4 +30,4 @@ config_methods=display push_button keypad p2ps
 # default no group interface
 no_group_iface=0
 # Group operating frequency
-group_operating_freq=2
+group_operating_freq=0

diff --git a/files/wifi-direct-manager.conf.tv b/files/wifi-direct-manager.conf.tv
index fe0b8e9..a5816fe 100644 (file)
--- a/files/wifi-direct-manager.conf.tv
+++ b/files/wifi-direct-manager.conf.tv
@@ -30,4 +30,4 @@ config_methods=keypad virtual_push_button physical_display
 # default no group interface
 no_group_iface=1
 # Group operating frequency
-group_operating_freq=2
+group_operating_freq=0

diff --git a/files/wifi-direct-manager.conf.wearable b/files/wifi-direct-manager.conf.wearable
index 9ff871d..c024181 100644 (file)
--- a/files/wifi-direct-manager.conf.wearable
+++ b/files/wifi-direct-manager.conf.wearable
@@ -30,4 +30,4 @@ config_methods=display push_button keypad p2ps
 # default no group interface
 no_group_iface=0
 # Group operating frequency
-group_operating_freq=2
+group_operating_freq=0

diff --git a/include/wifi-direct-group.h b/include/wifi-direct-group.h
index be46c4b..513599b 100644 (file)
--- a/include/wifi-direct-group.h
+++ b/include/wifi-direct-group.h
@@ -29,7 +29,6 @@
 #define __WIFI_DIRECT_GROUP_H__
 
 #define IFACE_NAME_LEN 16
-#define WFD_FREQ_2G 2
 
 typedef enum {
        WFD_GROUP_FLAG_NONE,

diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec
index 9a832f1..c84aae1 100644 (file)
--- a/packaging/wifi-direct-manager.spec
+++ b/packaging/wifi-direct-manager.spec
@@ -8,7 +8,7 @@
 
 Name:          wifi-direct-manager
 Summary:       Wi-Fi Direct manger
-Version:       1.2.240
+Version:       1.2.241
 Release:       1
 Group:      Network & Connectivity/Wireless
 License:    Apache-2.0

diff --git a/src/wifi-direct-iface.c b/src/wifi-direct-iface.c
index ab65caa..6e58f16 100644 (file)
--- a/src/wifi-direct-iface.c
+++ b/src/wifi-direct-iface.c
@@ -1210,7 +1210,7 @@ static void __wfd_manager_group_iface_handler(const gchar *method_name,
                memcpy(&(param.passphrase), manager->local->passphrase,
                                        sizeof(param.passphrase));
 
-               if (oem_conf)
+               if (oem_conf && oem_conf->group_operating_freq != 0)
                        param.freq = oem_conf->group_operating_freq;
 
                if (ssid != NULL)

diff --git a/src/wifi-direct-util.c b/src/wifi-direct-util.c
index a706499..253bbda 100644 (file)
--- a/src/wifi-direct-util.c
+++ b/src/wifi-direct-util.c
@@ -363,7 +363,7 @@ void wfd_util_load_wfd_conf(wfd_manager_s * manager)
        if (wfd_conf[WFD_CONF_GROUP_OPER_FREQ].int_value > 0)
                oem_conf->group_operating_freq = wfd_conf[WFD_CONF_GROUP_OPER_FREQ].int_value;
        else
-               oem_conf->group_operating_freq = WFD_FREQ_2G;
+               oem_conf->group_operating_freq = 0;
 
        __unload_wfd_config(key_file, wfd_conf);