From 4986f8dabb9beeb9bed7c6daca858b78c968f6a7 Mon Sep 17 00:00:00 2001
From: Martin Jansa <martin.jansa@lge.com>
Date: Sat, 13 Feb 2021 17:20:32 -0800
Subject: [PATCH] connman: refresh patches to apply on 1.39 version

:Release Notes:

:Detailed Notes:
Fixes:
http://gecko.lge.com/Errors/Details/116853
ERROR: Command Error: 'quilt --quiltrc TOPDIR/BUILD/work/raspberrypi3_64-webos-linux/connman/1.39-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0  Output:
stdout: Applying patch 0001-Add-support-for-the-WPS-PBS-and-PIN-mode.patch
patching file gsupplicant/gsupplicant.h
patching file gsupplicant/supplicant.c
patching file include/device.h
patching file include/technology.h
patching file plugins/wifi.c
Hunk #2 succeeded at 83 (offset 2 lines).
Hunk #3 succeeded at 168 with fuzz 1 (offset 2 lines).
Hunk #4 succeeded at 224 (offset 7 lines).
Hunk #5 succeeded at 812 (offset 8 lines).
Hunk #6 succeeded at 2080 (offset 28 lines).
Hunk #7 succeeded at 2302 (offset 28 lines).
Hunk #8 succeeded at 2328 (offset 28 lines).
Hunk #9 succeeded at 2358 (offset 28 lines).
Hunk #10 succeeded at 2479 (offset 28 lines).
Hunk #11 succeeded at 2536 (offset 40 lines).
Hunk #12 FAILED at 2634.
Hunk #13 succeeded at 2756 (offset 54 lines).
Hunk #14 succeeded at 2822 (offset 54 lines).
Hunk #15 succeeded at 2859 (offset 54 lines).
Hunk #16 succeeded at 2887 (offset 54 lines).
Hunk #17 succeeded at 2897 (offset 54 lines).
Hunk #18 succeeded at 2906 (offset 54 lines).
Hunk #19 succeeded at 2952 (offset 51 lines).
Hunk #20 succeeded at 3633 (offset 51 lines).
1 out of 20 hunks FAILED -- rejects in file plugins/wifi.c
patching file src/connman.h
Hunk #1 succeeded at 573 (offset 7 lines).
patching file src/device.c
patching file src/service.c
patching file src/technology.c
Hunk #1 succeeded at 1099 (offset 5 lines).
Hunk #2 succeeded at 1151 (offset 5 lines).
Patch 0001-Add-support-for-the-WPS-PBS-and-PIN-mode.patch does not apply (enforce with -f)

:Testing Performed:
Only build tested.

:QA Notes:
No change to image.

:Issues Addressed:
[PLAT-122546] Create GPVB with Yocto 3.2 Gatesgarth
---
 ...support-for-the-WPS-PBS-and-PIN-mode.patch | 76 ++++++++++---------
 ...Pv6-state-same-as-IPV4-on-disconnect.patch |  6 +-
 ...work-switching-and-unable-to-connect.patch |  6 +-
 ...i-networks-are-connected-via-WPS-PIN.patch |  2 +-
 ...ort-additional-feature-for-tethering.patch | 47 ++++++------
 ...port-channel-frequency-of-scanned-AP.patch | 44 +++++------
 ...ide-station-information-when-AP-mode.patch | 22 +++---
 ...r-regarding-connman_tethering_get_st.patch |  8 +-
 ...0009-Fix-the-wifi-connection-failure.patch |  6 +-
 ...-configuration-options-related-to-P2.patch | 10 +--
 ...ntConfigFile-from-main-configuration.patch | 18 ++---
 11 files changed, 126 insertions(+), 119 deletions(-)

diff --git a/meta-webos/recipes-connectivity/connman/connman/0001-Add-support-for-the-WPS-PBS-and-PIN-mode.patch b/meta-webos/recipes-connectivity/connman/connman/0001-Add-support-for-the-WPS-PBS-and-PIN-mode.patch
index c7abea1f3..fa4fc92be 100644
--- a/meta-webos/recipes-connectivity/connman/connman/0001-Add-support-for-the-WPS-PBS-and-PIN-mode.patch
+++ b/meta-webos/recipes-connectivity/connman/connman/0001-Add-support-for-the-WPS-PBS-and-PIN-mode.patch
@@ -1,4 +1,4 @@
-From 75513543b8393600f2d14b1b44587e137265b0dd Mon Sep 17 00:00:00 2001
+From 6f9c982b15c06c470f05f2d052cbc347becc0eda Mon Sep 17 00:00:00 2001
 From: Vibhanshu Dhote <vibhanshu.dhote@lge.com>
 Date: Wed, 21 Feb 2018 16:36:23 +0530
 Subject: [PATCH] Add support for the WPS PBS and PIN mode
@@ -21,12 +21,12 @@ Upstream-Status : Inappropriate [webOS specific]
  gsupplicant/supplicant.c  |  66 +++++++
  include/device.h          |   2 +
  include/technology.h      |   2 +
- plugins/wifi.c            | 387 ++++++++++++++++++++++++++++++++++++--
+ plugins/wifi.c            | 395 +++++++++++++++++++++++++++++++++++---
  src/connman.h             |   2 +
- src/device.c              | 116 ++++++++++++
+ src/device.c              | 116 +++++++++++
  src/service.c             |   2 +
  src/technology.c          |  49 +++++
- 9 files changed, 611 insertions(+), 20 deletions(-)
+ 9 files changed, 615 insertions(+), 24 deletions(-)
 
 diff --git a/gsupplicant/gsupplicant.h b/gsupplicant/gsupplicant.h
 index 7935c3a6..56cd61ee 100644
@@ -169,7 +169,7 @@ index 7508a9a1..a3095fb7 100644
  	const char *name;
  	enum connman_service_type type;
 diff --git a/plugins/wifi.c b/plugins/wifi.c
-index fc304e3b..ce761dad 100644
+index 6233fe11..0917eaf5 100644
 --- a/plugins/wifi.c
 +++ b/plugins/wifi.c
 @@ -64,6 +64,7 @@
@@ -180,7 +180,7 @@ index fc304e3b..ce761dad 100644
  
  #define BGSCAN_DEFAULT "simple:30:-65:300"
  #define AUTOSCAN_EXPONENTIAL "exponential:3:300"
-@@ -80,6 +81,8 @@
+@@ -82,6 +83,8 @@
  static struct connman_technology *wifi_technology = NULL;
  static struct connman_technology *p2p_technology = NULL;
  
@@ -189,7 +189,7 @@ index fc304e3b..ce761dad 100644
  enum wifi_ap_capability{
  	WIFI_AP_UNKNOWN 	= 0,
  	WIFI_AP_SUPPORTED 	= 1,
-@@ -163,6 +166,11 @@ struct wifi_data {
+@@ -165,6 +168,11 @@ struct wifi_data {
  	int servicing;
  	int disconnect_code;
  	int assoc_code;
@@ -200,8 +200,8 @@ index fc304e3b..ce761dad 100644
 +	bool wps_start_deferred;
  };
  
- static GList *iface_list = NULL;
-@@ -209,6 +217,17 @@ static bool is_p2p_connecting(void)
+ struct disconnect_data {
+@@ -216,6 +224,17 @@ static bool is_p2p_connecting(void)
  	return false;
  }
  
@@ -219,7 +219,7 @@ index fc304e3b..ce761dad 100644
  static void add_pending_wifi_device(struct wifi_data *wifi)
  {
  	if (g_list_find(pending_wifi_device, wifi))
-@@ -785,6 +804,9 @@ static int wifi_probe(struct connman_device *device)
+@@ -793,6 +812,9 @@ static int wifi_probe(struct connman_device *device)
  
  	wifi->watch = connman_rtnl_add_newlink_watch(wifi->index,
  							wifi_newlink, device);
@@ -229,7 +229,7 @@ index fc304e3b..ce761dad 100644
  	if (is_p2p_connecting())
  		add_pending_wifi_device(wifi);
  	else
-@@ -2030,6 +2052,217 @@ static int wifi_set_regdom(struct connman_device *device, const char *alpha2)
+@@ -2058,6 +2080,217 @@ static int wifi_set_regdom(struct connman_device *device, const char *alpha2)
  	return ret;
  }
  
@@ -447,7 +447,7 @@ index fc304e3b..ce761dad 100644
  static struct connman_device_driver wifi_ng_driver = {
  	.name		= "wifi",
  	.type		= CONNMAN_DEVICE_TYPE_WIFI,
-@@ -2041,6 +2274,8 @@ static struct connman_device_driver wifi_ng_driver = {
+@@ -2069,6 +2302,8 @@ static struct connman_device_driver wifi_ng_driver = {
  	.scan		= wifi_scan,
  	.stop_scan	= wifi_stop_scan,
  	.set_regdom	= wifi_set_regdom,
@@ -456,7 +456,7 @@ index fc304e3b..ce761dad 100644
  };
  
  static void system_ready(void)
-@@ -2065,6 +2300,23 @@ static int network_probe(struct connman_network *network)
+@@ -2093,6 +2328,23 @@ static int network_probe(struct connman_network *network)
  	return 0;
  }
  
@@ -480,7 +480,7 @@ index fc304e3b..ce761dad 100644
  static void network_remove(struct connman_network *network)
  {
  	struct connman_device *device = connman_network_get_device(network);
-@@ -2078,6 +2330,10 @@ static void network_remove(struct connman_network *network)
+@@ -2106,6 +2358,10 @@ static void network_remove(struct connman_network *network)
  
  	if (wifi->network != network)
  		return;
@@ -491,7 +491,7 @@ index fc304e3b..ce761dad 100644
  
  	wifi->network = NULL;
  }
-@@ -2195,6 +2451,9 @@ static int network_connect(struct connman_network *network)
+@@ -2223,6 +2479,9 @@ static int network_connect(struct connman_network *network)
  	if (!wifi)
  		return -ENODEV;
  
@@ -501,7 +501,7 @@ index fc304e3b..ce761dad 100644
  	ssid = g_try_malloc0(sizeof(GSupplicantSSID));
  	if (!ssid)
  		return -ENOMEM;
-@@ -2237,12 +2496,10 @@ static void disconnect_callback(int result, GSupplicantInterface *interface,
+@@ -2277,12 +2536,10 @@ static void disconnect_callback(int result, GSupplicantInterface *interface,
  	wifi->disconnecting = false;
  	wifi->connected = false;
  
@@ -517,8 +517,8 @@ index fc304e3b..ce761dad 100644
  }
  
  static int network_disconnect(struct connman_network *network)
-@@ -2377,20 +2634,22 @@ static bool handle_wps_completion(GSupplicantInterface *interface,
- 		unsigned int ssid_len, wps_ssid_len;
+@@ -2425,24 +2682,26 @@ static bool handle_wps_completion(GSupplicantInterface *interface,
+ 		struct disconnect_data *dd;
  		const char *wps_key;
  
 -		/* Checking if we got associated with requested
@@ -531,9 +531,13 @@ index fc304e3b..ce761dad 100644
 -
 -		if (!wps_ssid || wps_ssid_len != ssid_len ||
 -				memcmp(ssid, wps_ssid, ssid_len) != 0) {
+-			dd = g_malloc0(sizeof(*dd));
+-			dd->wifi = wifi;
+-			dd->network = network;
+-
 -			connman_network_set_associating(network, false);
 -			g_supplicant_interface_disconnect(wifi->interface,
--						disconnect_callback, wifi);
+-						disconnect_callback, dd);
 -			return false;
 +		if (wifi->wps_active == FALSE) {
 +			/* Checking if we got associated with requested
@@ -546,15 +550,19 @@ index fc304e3b..ce761dad 100644
 +
 +			if (!wps_ssid || wps_ssid_len != ssid_len ||
 +					memcmp(ssid, wps_ssid, ssid_len) != 0) {
++				dd = g_malloc0(sizeof(*dd));
++				dd->wifi = wifi;
++				dd->network = network;
++
 +				connman_network_set_associating(network, false);
 +				g_supplicant_interface_disconnect(wifi->interface,
-+							disconnect_callback, wifi);
++							disconnect_callback, dd);
 +				return false;
 +			}
  		}
  
  		wps_key = g_supplicant_interface_get_wps_key(interface);
-@@ -2445,6 +2704,65 @@ static bool handle_4way_handshake_failure(GSupplicantInterface *interface,
+@@ -2499,6 +2758,65 @@ static bool handle_4way_handshake_failure(GSupplicantInterface *interface,
  	return false;
  }
  
@@ -620,7 +628,7 @@ index fc304e3b..ce761dad 100644
  static void interface_state(GSupplicantInterface *interface)
  {
  	struct connman_network *network;
-@@ -2452,7 +2770,10 @@ static void interface_state(GSupplicantInterface *interface)
+@@ -2506,7 +2824,10 @@ static void interface_state(GSupplicantInterface *interface)
  	struct wifi_data *wifi;
  	GSupplicantState state = g_supplicant_interface_get_state(interface);
  	bool wps;
@@ -631,7 +639,7 @@ index fc304e3b..ce761dad 100644
  
  	wifi = g_supplicant_interface_get_data(interface);
  
-@@ -2486,6 +2807,23 @@ static void interface_state(GSupplicantInterface *interface)
+@@ -2540,6 +2861,23 @@ static void interface_state(GSupplicantInterface *interface)
  	if (!network)
  		return;
  
@@ -655,7 +663,7 @@ index fc304e3b..ce761dad 100644
  	switch (state) {
  	case G_SUPPLICANT_STATE_SCANNING:
  		if (wifi->connected)
-@@ -2497,6 +2835,7 @@ static void interface_state(GSupplicantInterface *interface)
+@@ -2551,6 +2889,7 @@ static void interface_state(GSupplicantInterface *interface)
  	case G_SUPPLICANT_STATE_ASSOCIATING:
  		stop_autoscan(device);
  
@@ -663,7 +671,7 @@ index fc304e3b..ce761dad 100644
  		if (!wifi->connected)
  			connman_network_set_associating(network, true);
  
-@@ -2506,6 +2845,7 @@ static void interface_state(GSupplicantInterface *interface)
+@@ -2560,6 +2899,7 @@ static void interface_state(GSupplicantInterface *interface)
  		/* though it should be already stopped: */
  		stop_autoscan(device);
  
@@ -671,7 +679,7 @@ index fc304e3b..ce761dad 100644
  		if (!handle_wps_completion(interface, network, device, wifi))
  			break;
  
-@@ -2514,6 +2854,7 @@ static void interface_state(GSupplicantInterface *interface)
+@@ -2568,6 +2908,7 @@ static void interface_state(GSupplicantInterface *interface)
  		wifi->disconnect_code = 0;
  		wifi->assoc_code = 0;
  		wifi->load_shaping_retries = 0;
@@ -679,7 +687,7 @@ index fc304e3b..ce761dad 100644
  		break;
  
  	case G_SUPPLICANT_STATE_DISCONNECTED:
-@@ -2562,7 +2903,12 @@ static void interface_state(GSupplicantInterface *interface)
+@@ -2613,7 +2954,12 @@ static void interface_state(GSupplicantInterface *interface)
  		}
  		wifi->disconnecting = false;
  
@@ -693,7 +701,7 @@ index fc304e3b..ce761dad 100644
  
  		break;
  
-@@ -3238,6 +3584,7 @@ static const GSupplicantCallbacks callbacks = {
+@@ -3289,6 +3635,7 @@ static const GSupplicantCallbacks callbacks = {
  	.peer_lost		= peer_lost,
  	.peer_changed		= peer_changed,
  	.peer_request		= peer_request,
@@ -702,10 +710,10 @@ index fc304e3b..ce761dad 100644
  	.disconnect_reasoncode  = disconnect_reasoncode,
  	.assoc_status_code      = assoc_status_code,
 diff --git a/src/connman.h b/src/connman.h
-index 3bdc0dc7..86e481e6 100644
+index a43a6b8b..b8de7bd1 100644
 --- a/src/connman.h
 +++ b/src/connman.h
-@@ -566,6 +566,8 @@ enum connman_service_type __connman_device_get_service_type(struct connman_devic
+@@ -573,6 +573,8 @@ enum connman_service_type __connman_device_get_service_type(struct connman_devic
  struct connman_device *__connman_device_find_device(enum connman_service_type type);
  int __connman_device_request_scan(enum connman_service_type type);
  int __connman_device_request_scan_full(enum connman_service_type type);
@@ -842,7 +850,7 @@ index 264c5e2d..d3048379 100644
  {
  	struct ifreq ifr;
 diff --git a/src/service.c b/src/service.c
-index 2f497d10..58d91d74 100644
+index 69f0a511..06f7893d 100644
 --- a/src/service.c
 +++ b/src/service.c
 @@ -55,6 +55,8 @@ static unsigned int vpn_autoconnect_id = 0;
@@ -855,10 +863,10 @@ index 2f497d10..58d91d74 100644
  	bool valid;
  	bool enabled;
 diff --git a/src/technology.c b/src/technology.c
-index 4e053fc9..0119c2d5 100644
+index 672d6ea8..817d9753 100644
 --- a/src/technology.c
 +++ b/src/technology.c
-@@ -1094,6 +1094,50 @@ static DBusMessage *scan(DBusConnection *conn, DBusMessage *msg, void *data)
+@@ -1099,6 +1099,50 @@ static DBusMessage *scan(DBusConnection *conn, DBusMessage *msg, void *data)
  	return NULL;
  }
  
@@ -909,7 +917,7 @@ index 4e053fc9..0119c2d5 100644
  static const GDBusMethodTable technology_methods[] = {
  	{ GDBUS_DEPRECATED_METHOD("GetProperties",
  			NULL, GDBUS_ARGS({ "properties", "a{sv}" }),
-@@ -1102,12 +1146,17 @@ static const GDBusMethodTable technology_methods[] = {
+@@ -1107,12 +1151,17 @@ static const GDBusMethodTable technology_methods[] = {
  			GDBUS_ARGS({ "name", "s" }, { "value", "v" }),
  			NULL, set_property) },
  	{ GDBUS_ASYNC_METHOD("Scan", NULL, NULL, scan) },
diff --git a/meta-webos/recipes-connectivity/connman/connman/0002-Set-IPv6-state-same-as-IPV4-on-disconnect.patch b/meta-webos/recipes-connectivity/connman/connman/0002-Set-IPv6-state-same-as-IPV4-on-disconnect.patch
index d9f9fce9b..5c0f42920 100644
--- a/meta-webos/recipes-connectivity/connman/connman/0002-Set-IPv6-state-same-as-IPV4-on-disconnect.patch
+++ b/meta-webos/recipes-connectivity/connman/connman/0002-Set-IPv6-state-same-as-IPV4-on-disconnect.patch
@@ -1,4 +1,4 @@
-From 920cf80d8b0f3192039662b79c60e2d681ad5454 Mon Sep 17 00:00:00 2001
+From a435d92e28c041f492b4e23081c52493daa53302 Mon Sep 17 00:00:00 2001
 From: "krishna.konwar" <krishna.konwar@lge.com>
 Date: Fri, 3 Aug 2018 16:17:00 +0530
 Subject: [PATCH] Set IPv6 state same as IPV4 on disconnect
@@ -17,10 +17,10 @@ Upstream-Status : Inappropriate [webOS specific]
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/service.c b/src/service.c
-index 58d91d74..ff44f9c2 100644
+index 06f7893d..0e1bc59d 100644
 --- a/src/service.c
 +++ b/src/service.c
-@@ -6294,8 +6294,10 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service,
+@@ -6368,8 +6368,10 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service,
  		if (service->state == CONNMAN_SERVICE_STATE_IDLE)
  			return -EINVAL;
  
diff --git a/meta-webos/recipes-connectivity/connman/connman/0003-Fix-for-wifi-network-switching-and-unable-to-connect.patch b/meta-webos/recipes-connectivity/connman/connman/0003-Fix-for-wifi-network-switching-and-unable-to-connect.patch
index 47312699c..1c6006216 100644
--- a/meta-webos/recipes-connectivity/connman/connman/0003-Fix-for-wifi-network-switching-and-unable-to-connect.patch
+++ b/meta-webos/recipes-connectivity/connman/connman/0003-Fix-for-wifi-network-switching-and-unable-to-connect.patch
@@ -1,4 +1,4 @@
-From 4d8b4db852decca3847d3cf49dec69688d2d168f Mon Sep 17 00:00:00 2001
+From 1a63735249f4cee5ded31304cc1e1291b4d64b1a Mon Sep 17 00:00:00 2001
 From: Vasu Kantubukta <vasu.kantubukta@lge.com>
 Date: Wed, 19 Dec 2018 21:02:59 +0530
 Subject: [PATCH] Fix for wifi network switching and unable to connect to open
@@ -32,10 +32,10 @@ Upstream-Status: Inappropriate [webOS specific]
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/plugins/wifi.c b/plugins/wifi.c
-index ce761dad..246d7335 100644
+index 0917eaf5..a9dd35c4 100644
 --- a/plugins/wifi.c
 +++ b/plugins/wifi.c
-@@ -2903,7 +2903,7 @@ static void interface_state(GSupplicantInterface *interface)
+@@ -2954,7 +2954,7 @@ static void interface_state(GSupplicantInterface *interface)
  		}
  		wifi->disconnecting = false;
  
diff --git a/meta-webos/recipes-connectivity/connman/connman/0004-Multiple-wi-fi-networks-are-connected-via-WPS-PIN.patch b/meta-webos/recipes-connectivity/connman/connman/0004-Multiple-wi-fi-networks-are-connected-via-WPS-PIN.patch
index 4f42777b8..e19c31a6d 100644
--- a/meta-webos/recipes-connectivity/connman/connman/0004-Multiple-wi-fi-networks-are-connected-via-WPS-PIN.patch
+++ b/meta-webos/recipes-connectivity/connman/connman/0004-Multiple-wi-fi-networks-are-connected-via-WPS-PIN.patch
@@ -1,4 +1,4 @@
-From 11b028d0a07e653411cb66149cc9a3dbcce14aaf Mon Sep 17 00:00:00 2001
+From db4b54b53137e213b7b0437d51e6b7c18b9b73fe Mon Sep 17 00:00:00 2001
 From: "sachin.shetty" <sachin.shetty@lge.com>
 Date: Mon, 24 Jun 2019 16:55:43 +0530
 Subject: [PATCH] Multiple wi-fi networks are connected via WPS PIN.
diff --git a/meta-webos/recipes-connectivity/connman/connman/0005-Support-additional-feature-for-tethering.patch b/meta-webos/recipes-connectivity/connman/connman/0005-Support-additional-feature-for-tethering.patch
index aad16fdf6..ed938ab03 100644
--- a/meta-webos/recipes-connectivity/connman/connman/0005-Support-additional-feature-for-tethering.patch
+++ b/meta-webos/recipes-connectivity/connman/connman/0005-Support-additional-feature-for-tethering.patch
@@ -1,4 +1,4 @@
-From ba32e029316f438ab6bba54f655650783f15ce7b Mon Sep 17 00:00:00 2001
+From ac2514ad3110485c0c9da481a552178cae31229a Mon Sep 17 00:00:00 2001
 From: "sungmok.shin" <sungmok.shin@lge.com>
 Date: Tue, 25 Jun 2019 13:11:11 +0900
 Subject: [PATCH] Support additional feature for tethering
@@ -9,12 +9,12 @@ Support additional feature for tethering
  include/technology.h |   1 +
  plugins/wifi.c       |  11 +++-
  src/connman.h        |   1 +
- src/technology.c     | 119 +++++++++++++++++++++++++++++++++++++---
+ src/technology.c     | 118 +++++++++++++++++++++++++++++++++++++---
  src/tethering.c      | 125 +++++++++++++++++++++++++++++++++++++++++++
- 6 files changed, 252 insertions(+), 8 deletions(-)
+ 6 files changed, 251 insertions(+), 8 deletions(-)
 
 diff --git a/gdhcp/server.c b/gdhcp/server.c
-index 85405f19..2a400692 100644
+index 52ea2a55..f82c4bbd 100644
 --- a/gdhcp/server.c
 +++ b/gdhcp/server.c
 @@ -255,6 +255,9 @@ static uint32_t find_free_or_expired_nip(GDHCPServer *dhcp_server,
@@ -40,10 +40,10 @@ index a3095fb7..1d78649c 100644
  
  void connman_technology_wps_failed_notify(struct connman_technology *technology);
 diff --git a/plugins/wifi.c b/plugins/wifi.c
-index 246d7335..fb9f064f 100644
+index a9dd35c4..314d3126 100644
 --- a/plugins/wifi.c
 +++ b/plugins/wifi.c
-@@ -3606,16 +3606,25 @@ static void tech_remove(struct connman_technology *technology)
+@@ -3657,16 +3657,25 @@ static void tech_remove(struct connman_technology *technology)
  static GSupplicantSSID *ssid_ap_init(const char *ssid, const char *passphrase)
  {
  	GSupplicantSSID *ap;
@@ -71,10 +71,10 @@ index 246d7335..fb9f064f 100644
  	if (!passphrase || strlen(passphrase) == 0) {
  		ap->security = G_SUPPLICANT_SECURITY_NONE;
 diff --git a/src/connman.h b/src/connman.h
-index 86e481e6..57f218f9 100644
+index b8de7bd1..8c2aebce 100644
 --- a/src/connman.h
 +++ b/src/connman.h
-@@ -641,6 +641,7 @@ const char *__connman_tethering_get_bridge(void);
+@@ -648,6 +648,7 @@ const char *__connman_tethering_get_bridge(void);
  int __connman_tethering_set_enabled(void);
  void __connman_tethering_set_disabled(void);
  void __connman_tethering_list_clients(DBusMessageIter *array);
@@ -83,7 +83,7 @@ index 86e481e6..57f218f9 100644
  int __connman_private_network_request(DBusMessage *msg, const char *owner);
  int __connman_private_network_release(const char *path);
 diff --git a/src/technology.c b/src/technology.c
-index 0119c2d5..ae494c00 100644
+index 817d9753..d5855640 100644
 --- a/src/technology.c
 +++ b/src/technology.c
 @@ -66,6 +66,8 @@ struct connman_technology {
@@ -95,9 +95,9 @@ index 0119c2d5..ae494c00 100644
  
  	bool enable_persistent; /* Save the tech state */
  
-@@ -190,6 +192,16 @@ static void technology_save(struct connman_technology *technology)
- 					"Tethering.Passphrase",
- 					technology->tethering_passphrase);
+@@ -192,6 +194,16 @@ static void technology_save(struct connman_technology *technology)
+ 		g_free(enc);
+ 	}
  
 +	if (technology->tethering_channel)
 +		g_key_file_set_integer(keyfile, identifier,
@@ -112,7 +112,7 @@ index 0119c2d5..ae494c00 100644
  done:
  	g_free(identifier);
  
-@@ -213,14 +225,21 @@ int connman_technology_tethering_notify(struct connman_technology *technology,
+@@ -215,14 +227,21 @@ int connman_technology_tethering_notify(struct connman_technology *technology,
  							bool enabled)
  {
  	int err;
@@ -135,7 +135,7 @@ index 0119c2d5..ae494c00 100644
  		if (err < 0)
  			return err;
  	} else
-@@ -251,8 +270,7 @@ static int set_tethering(struct connman_technology *technology,
+@@ -253,8 +272,7 @@ static int set_tethering(struct connman_technology *technology,
  	if (!bridge)
  		return -EOPNOTSUPP;
  
@@ -145,7 +145,7 @@ index 0119c2d5..ae494c00 100644
  		return -EINVAL;
  
  	for (tech_drivers = technology->driver_list; tech_drivers;
-@@ -377,6 +395,17 @@ bool connman_technology_get_wifi_tethering(const char **ssid,
+@@ -379,6 +397,17 @@ bool connman_technology_get_wifi_tethering(const char **ssid,
  	return true;
  }
  
@@ -163,21 +163,20 @@ index 0119c2d5..ae494c00 100644
  static void free_rfkill(gpointer data)
  {
  	struct connman_rfkill *rfkill = data;
-@@ -438,6 +467,13 @@ static void technology_load(struct connman_technology *technology)
- 
- 	technology->tethering_passphrase = g_key_file_get_string(keyfile,
+@@ -443,6 +472,12 @@ static void technology_load(struct connman_technology *technology)
  				identifier, "Tethering.Passphrase", NULL);
+ 	if (enc)
+ 		technology->tethering_passphrase = g_strcompress(enc);
 +
 +	technology->tethering_channel = g_key_file_get_integer(keyfile,
 +				identifier, "Tethering.Channel", NULL);
 +
 +	technology->tethering_ipaddress = g_key_file_get_string(keyfile,
 +				identifier, "Tethering.IP", NULL);
-+
  done:
  	g_free(identifier);
  
-@@ -549,6 +585,16 @@ static void append_properties(DBusMessageIter *iter,
+@@ -554,6 +589,16 @@ static void append_properties(DBusMessageIter *iter,
  					DBUS_TYPE_STRING,
  					&technology->tethering_passphrase);
  
@@ -194,7 +193,7 @@ index 0119c2d5..ae494c00 100644
  	connman_dbus_dict_close(iter, &dict);
  }
  
-@@ -947,10 +993,19 @@ static DBusMessage *set_property(DBusConnection *conn,
+@@ -952,10 +997,19 @@ static DBusMessage *set_property(DBusConnection *conn,
  		if (technology->type != CONNMAN_SERVICE_TYPE_WIFI)
  			return __connman_error_not_supported(msg);
  
@@ -218,7 +217,7 @@ index 0119c2d5..ae494c00 100644
  
  		if (g_strcmp0(technology->tethering_passphrase, str) != 0) {
  			g_free(technology->tethering_passphrase);
-@@ -963,6 +1018,55 @@ static DBusMessage *set_property(DBusConnection *conn,
+@@ -968,6 +1022,55 @@ static DBusMessage *set_property(DBusConnection *conn,
  					DBUS_TYPE_STRING,
  					&technology->tethering_passphrase);
  		}
@@ -274,7 +273,7 @@ index 0119c2d5..ae494c00 100644
  	} else if (g_str_equal(name, "Powered")) {
  		dbus_bool_t enable;
  
-@@ -1232,6 +1336,7 @@ static void technology_put(struct connman_technology *technology)
+@@ -1237,6 +1340,7 @@ static void technology_put(struct connman_technology *technology)
  	g_free(technology->regdom);
  	g_free(technology->tethering_ident);
  	g_free(technology->tethering_passphrase);
@@ -283,7 +282,7 @@ index 0119c2d5..ae494c00 100644
  }
  
 diff --git a/src/tethering.c b/src/tethering.c
-index e2687b6e..b465bdd3 100644
+index f930a26b..52baebdd 100644
 --- a/src/tethering.c
 +++ b/src/tethering.c
 @@ -49,6 +49,7 @@
diff --git a/meta-webos/recipes-connectivity/connman/connman/0006-Support-channel-frequency-of-scanned-AP.patch b/meta-webos/recipes-connectivity/connman/connman/0006-Support-channel-frequency-of-scanned-AP.patch
index 59de1d754..c022830d7 100644
--- a/meta-webos/recipes-connectivity/connman/connman/0006-Support-channel-frequency-of-scanned-AP.patch
+++ b/meta-webos/recipes-connectivity/connman/connman/0006-Support-channel-frequency-of-scanned-AP.patch
@@ -1,4 +1,4 @@
-From e756a144707cdcf5446391f7fcbf480264caccce Mon Sep 17 00:00:00 2001
+From 16ebb39e83777e0afd9ff7412a844fa103bef1c1 Mon Sep 17 00:00:00 2001
 From: "sungmok.shin" <sungmok.shin@lge.com>
 Date: Wed, 28 Aug 2019 15:35:45 +0900
 Subject: [PATCH] Support channel frequency of scanned AP
@@ -298,7 +298,7 @@ index 8fd2f83f..082c1a3d 100644
  
  int connman_device_driver_register(struct connman_device_driver *driver);
 diff --git a/include/network.h b/include/network.h
-index 8f87d7c5..ad764e64 100644
+index 8f9dd94a..1a8f57ad 100644
 --- a/include/network.h
 +++ b/include/network.h
 @@ -29,6 +29,7 @@
@@ -336,11 +336,11 @@ index 8f87d7c5..ad764e64 100644
  							const char *name);
  int connman_network_set_strength(struct connman_network *network,
 diff --git a/plugins/wifi.c b/plugins/wifi.c
-index fb9f064f..034fecd2 100644
+index 314d3126..6a61fab2 100644
 --- a/plugins/wifi.c
 +++ b/plugins/wifi.c
-@@ -173,6 +173,12 @@ struct wifi_data {
- 	bool wps_start_deferred;
+@@ -180,6 +180,12 @@ struct disconnect_data {
+ 	struct connman_network *network;
  };
  
 +struct wifi_cb_data {
@@ -352,7 +352,7 @@ index fb9f064f..034fecd2 100644
  static GList *iface_list = NULL;
  
  static GList *pending_wifi_device = NULL;
-@@ -184,6 +190,27 @@ static int tech_set_tethering(struct connman_technology *technology,
+@@ -191,6 +197,27 @@ static int tech_set_tethering(struct connman_technology *technology,
  				const char *identifier, const char *passphrase,
  				const char *bridge, bool enabled);
  
@@ -380,7 +380,7 @@ index fb9f064f..034fecd2 100644
  static int p2p_tech_probe(struct connman_technology *technology)
  {
  	p2p_technology = technology;
-@@ -2263,6 +2290,52 @@ static int wifi_cancel_wps(struct connman_device *device)
+@@ -2291,6 +2318,52 @@ static int wifi_cancel_wps(struct connman_device *device)
  	return cancel_wps(wifi);
  }
  
@@ -433,7 +433,7 @@ index fb9f064f..034fecd2 100644
  static struct connman_device_driver wifi_ng_driver = {
  	.name		= "wifi",
  	.type		= CONNMAN_DEVICE_TYPE_WIFI,
-@@ -2275,7 +2348,8 @@ static struct connman_device_driver wifi_ng_driver = {
+@@ -2303,7 +2376,8 @@ static struct connman_device_driver wifi_ng_driver = {
  	.stop_scan	= wifi_stop_scan,
  	.set_regdom	= wifi_set_regdom,
  	.start_wps	= wifi_start_wps,
@@ -443,7 +443,7 @@ index fb9f064f..034fecd2 100644
  };
  
  static void system_ready(void)
-@@ -3103,6 +3177,7 @@ static void network_added(GSupplicantNetwork *supplicant_network)
+@@ -3154,6 +3228,7 @@ static void network_added(GSupplicantNetwork *supplicant_network)
  	bool wps_pbc;
  	bool wps_ready;
  	bool wps_advertizing;
@@ -451,7 +451,7 @@ index fb9f064f..034fecd2 100644
  
  	mode = g_supplicant_network_get_mode(supplicant_network);
  	identifier = g_supplicant_network_get_identifier(supplicant_network);
-@@ -3122,6 +3197,7 @@ static void network_added(GSupplicantNetwork *supplicant_network)
+@@ -3173,6 +3248,7 @@ static void network_added(GSupplicantNetwork *supplicant_network)
  	wps_ready = g_supplicant_network_is_wps_active(supplicant_network);
  	wps_advertizing = g_supplicant_network_is_wps_advertizing(
  							supplicant_network);
@@ -459,7 +459,7 @@ index fb9f064f..034fecd2 100644
  
  	if (!wifi)
  		return;
-@@ -3188,6 +3264,11 @@ static void network_added(GSupplicantNetwork *supplicant_network)
+@@ -3239,6 +3315,11 @@ static void network_added(GSupplicantNetwork *supplicant_network)
  			wifi->hidden = NULL;
  		}
  	}
@@ -471,7 +471,7 @@ index fb9f064f..034fecd2 100644
  }
  
  static void network_removed(GSupplicantNetwork *network)
-@@ -3224,11 +3305,13 @@ static void network_changed(GSupplicantNetwork *network, const char *property)
+@@ -3275,11 +3356,13 @@ static void network_changed(GSupplicantNetwork *network, const char *property)
  	const char *name, *identifier;
  	struct connman_network *connman_network;
  	bool update_needed;
@@ -485,7 +485,7 @@ index fb9f064f..034fecd2 100644
  
  	DBG("name %s", name);
  
-@@ -3239,6 +3322,11 @@ static void network_changed(GSupplicantNetwork *network, const char *property)
+@@ -3290,6 +3373,11 @@ static void network_changed(GSupplicantNetwork *network, const char *property)
  	if (!connman_network)
  		return;
  
@@ -598,7 +598,7 @@ index d3048379..ce70da90 100644
  {
  	struct ifreq ifr;
 diff --git a/src/network.c b/src/network.c
-index f2ab16bd..161e84e0 100644
+index 256e3b5f..aa8802ff 100644
 --- a/src/network.c
 +++ b/src/network.c
 @@ -55,6 +55,12 @@
@@ -750,7 +750,7 @@ index f2ab16bd..161e84e0 100644
   * connman_network_set_name:
   * @network: network structure
 diff --git a/src/service.c b/src/service.c
-index ff44f9c2..66160cc7 100644
+index 0e1bc59d..ce51034e 100644
 --- a/src/service.c
 +++ b/src/service.c
 @@ -153,6 +153,7 @@ static struct connman_ipconfig *create_ip6config(struct connman_service *service
@@ -761,7 +761,7 @@ index ff44f9c2..66160cc7 100644
  
  struct find_data {
  	const char *path;
-@@ -1620,6 +1621,13 @@ static void strength_changed(struct connman_service *service)
+@@ -1662,6 +1663,13 @@ static void strength_changed(struct connman_service *service)
  	connman_dbus_property_changed_basic(service->path,
  				CONNMAN_SERVICE_INTERFACE, "Strength",
  					DBUS_TYPE_BYTE, &service->strength);
@@ -775,7 +775,7 @@ index ff44f9c2..66160cc7 100644
  }
  
  static void favorite_changed(struct connman_service *service)
-@@ -2474,6 +2482,57 @@ int connman_service_iterate_services(connman_service_iterate_cb cb,
+@@ -2518,6 +2526,57 @@ int connman_service_iterate_services(connman_service_iterate_cb cb,
  	return ret;
  }
  
@@ -833,7 +833,7 @@ index ff44f9c2..66160cc7 100644
  static void append_properties(DBusMessageIter *dict, dbus_bool_t limited,
  					struct connman_service *service)
  {
-@@ -2539,9 +2598,21 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited,
+@@ -2583,9 +2642,21 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited,
  						append_ethernet, service);
  		break;
  	case CONNMAN_SERVICE_TYPE_WIFI:
@@ -857,7 +857,7 @@ index ff44f9c2..66160cc7 100644
  						append_ethernet, service);
  		break;
 diff --git a/src/technology.c b/src/technology.c
-index ae494c00..5bfd48f6 100644
+index d5855640..13c056cd 100644
 --- a/src/technology.c
 +++ b/src/technology.c
 @@ -77,6 +77,7 @@ struct connman_technology {
@@ -868,7 +868,7 @@ index ae494c00..5bfd48f6 100644
  
  	bool rfkill_driven;
  	bool softblocked;
-@@ -540,6 +541,19 @@ static bool connman_technology_load_offlinemode(void)
+@@ -544,6 +545,19 @@ static bool connman_technology_load_offlinemode(void)
  	return offlinemode;
  }
  
@@ -888,7 +888,7 @@ index ae494c00..5bfd48f6 100644
  static void append_properties(DBusMessageIter *iter,
  		struct connman_technology *technology)
  {
-@@ -575,6 +589,11 @@ static void append_properties(DBusMessageIter *iter,
+@@ -579,6 +593,11 @@ static void append_properties(DBusMessageIter *iter,
  					DBUS_TYPE_BOOLEAN,
  					&val);
  
@@ -900,7 +900,7 @@ index ae494c00..5bfd48f6 100644
  	if (technology->tethering_ident)
  		connman_dbus_dict_append_basic(&dict, "TetheringIdentifier",
  					DBUS_TYPE_STRING,
-@@ -1242,6 +1261,51 @@ static DBusMessage *cancel_wps(DBusConnection *conn, DBusMessage *msg, void *dat
+@@ -1246,6 +1265,51 @@ static DBusMessage *cancel_wps(DBusConnection *conn, DBusMessage *msg, void *dat
  	return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
  }
  
diff --git a/meta-webos/recipes-connectivity/connman/connman/0007-Provide-station-information-when-AP-mode.patch b/meta-webos/recipes-connectivity/connman/connman/0007-Provide-station-information-when-AP-mode.patch
index 46f774658..72ee7840b 100644
--- a/meta-webos/recipes-connectivity/connman/connman/0007-Provide-station-information-when-AP-mode.patch
+++ b/meta-webos/recipes-connectivity/connman/connman/0007-Provide-station-information-when-AP-mode.patch
@@ -1,4 +1,4 @@
-From ad132955d5b6896d5b606e86e579d214ec6e5022 Mon Sep 17 00:00:00 2001
+From 62174364b15f0ed8694b3bdeca3985be65d72dae Mon Sep 17 00:00:00 2001
 From: "sungmok.shin" <sungmok.shin@lge.com>
 Date: Sat, 31 Aug 2019 14:41:49 +0900
 Subject: [PATCH] Provide station information when AP mode
@@ -113,10 +113,10 @@ index 1d78649c..60686900 100644
  void connman_technology_regdom_notify(struct connman_technology *technology,
  							const char *alpha2);
 diff --git a/plugins/wifi.c b/plugins/wifi.c
-index 034fecd2..f5a6bc6e 100644
+index 6a61fab2..7e5e33ee 100644
 --- a/plugins/wifi.c
 +++ b/plugins/wifi.c
-@@ -3446,6 +3446,25 @@ static void sta_deauthorized(GSupplicantInterface *interface,
+@@ -3497,6 +3497,25 @@ static void sta_deauthorized(GSupplicantInterface *interface,
  	__connman_tethering_client_unregister(addr);
  }
  
@@ -142,7 +142,7 @@ index 034fecd2..f5a6bc6e 100644
  static void apply_peer_services(GSupplicantPeer *peer,
  				struct connman_peer *connman_peer)
  {
-@@ -3666,6 +3685,8 @@ static const GSupplicantCallbacks callbacks = {
+@@ -3717,6 +3736,8 @@ static const GSupplicantCallbacks callbacks = {
  	.network_removed	= network_removed,
  	.network_changed	= network_changed,
  	.network_associated	= network_associated,
@@ -152,10 +152,10 @@ index 034fecd2..f5a6bc6e 100644
  	.sta_deauthorized	= sta_deauthorized,
  	.peer_found		= peer_found,
 diff --git a/src/connman.h b/src/connman.h
-index 57f218f9..374b0def 100644
+index 8c2aebce..33d097c5 100644
 --- a/src/connman.h
 +++ b/src/connman.h
-@@ -634,10 +634,21 @@ bool __connman_config_address_provisioned(const char *address,
+@@ -641,10 +641,21 @@ bool __connman_config_address_provisioned(const char *address,
  
  #include <connman/tethering.h>
  
@@ -217,10 +217,10 @@ index 3bf8f4e4..2aacee37 100644
  			GDBUS_ARGS({ "provider", "o" }), NULL,
  			remove_provider) },
 diff --git a/src/technology.c b/src/technology.c
-index 5bfd48f6..aa4a1c69 100644
+index 13c056cd..c18080df 100644
 --- a/src/technology.c
 +++ b/src/technology.c
-@@ -2076,3 +2076,39 @@ void __connman_technology_cleanup(void)
+@@ -2080,3 +2080,39 @@ void __connman_technology_cleanup(void)
  
  	dbus_connection_unref(connection);
  }
@@ -261,7 +261,7 @@ index 5bfd48f6..aa4a1c69 100644
 +					DBUS_TYPE_STRING, append_station_mac, NULL);
 +}
 diff --git a/src/tethering.c b/src/tethering.c
-index b465bdd3..83df2896 100644
+index 52baebdd..7922a5d2 100644
 --- a/src/tethering.c
 +++ b/src/tethering.c
 @@ -29,6 +29,7 @@
@@ -380,7 +380,7 @@ index b465bdd3..83df2896 100644
  const char *__connman_tethering_get_bridge(void)
  {
  	int sk, err;
-@@ -730,6 +818,9 @@ int __connman_private_network_request(DBusMessage *msg, const char *owner)
+@@ -731,6 +819,9 @@ int __connman_private_network_request(DBusMessage *msg, const char *owner)
  
  	g_hash_table_insert(pn_hash, pn->path, pn);
  
@@ -390,7 +390,7 @@ index b465bdd3..83df2896 100644
  	return 0;
  
  error:
-@@ -805,6 +896,8 @@ void __connman_tethering_cleanup(void)
+@@ -806,6 +897,8 @@ void __connman_tethering_cleanup(void)
  		return;
  
  	g_hash_table_destroy(pn_hash);
diff --git a/meta-webos/recipes-connectivity/connman/connman/0008-Fix-compile-error-regarding-connman_tethering_get_st.patch b/meta-webos/recipes-connectivity/connman/connman/0008-Fix-compile-error-regarding-connman_tethering_get_st.patch
index 0bf71cfc8..d6e676aa7 100644
--- a/meta-webos/recipes-connectivity/connman/connman/0008-Fix-compile-error-regarding-connman_tethering_get_st.patch
+++ b/meta-webos/recipes-connectivity/connman/connman/0008-Fix-compile-error-regarding-connman_tethering_get_st.patch
@@ -1,4 +1,4 @@
-From dfb783afcffbba0c05fe29ffb360dda0f74bd4b0 Mon Sep 17 00:00:00 2001
+From e1caf12c2ce280bedc7c3cc7d8e232fc55f5b4f0 Mon Sep 17 00:00:00 2001
 From: "sungmok.shin" <sungmok.shin@lge.com>
 Date: Mon, 23 Sep 2019 23:08:32 +0900
 Subject: [PATCH] Fix compile error regarding connman_tethering_get_sta_hash
@@ -10,10 +10,10 @@ Fix compile error regarding connman_tethering_get_sta_hash
  2 files changed, 5 insertions(+)
 
 diff --git a/src/technology.c b/src/technology.c
-index aa4a1c69..54a32b33 100644
+index c18080df..499ec452 100644
 --- a/src/technology.c
 +++ b/src/technology.c
-@@ -2081,6 +2081,9 @@ static void append_station_mac(DBusMessageIter *iter, void *user_data)
+@@ -2085,6 +2085,9 @@ static void append_station_mac(DBusMessageIter *iter, void *user_data)
  {
  	GHashTable *sta_hash = __connman_tethering_get_sta_hash();
  
@@ -24,7 +24,7 @@ index aa4a1c69..54a32b33 100644
  	gpointer key, value;
  	g_hash_table_iter_init (&iterator, sta_hash);
 diff --git a/src/tethering.c b/src/tethering.c
-index 83df2896..1392137c 100644
+index 7922a5d2..331e8dfe 100644
 --- a/src/tethering.c
 +++ b/src/tethering.c
 @@ -170,6 +170,8 @@ GHashTable *__connman_tethering_get_sta_hash()
diff --git a/meta-webos/recipes-connectivity/connman/connman/0009-Fix-the-wifi-connection-failure.patch b/meta-webos/recipes-connectivity/connman/connman/0009-Fix-the-wifi-connection-failure.patch
index a465d2b16..6163e89ce 100644
--- a/meta-webos/recipes-connectivity/connman/connman/0009-Fix-the-wifi-connection-failure.patch
+++ b/meta-webos/recipes-connectivity/connman/connman/0009-Fix-the-wifi-connection-failure.patch
@@ -1,4 +1,4 @@
-From 7d3a4d52ff579059b994db75ebc97370e9a3e386 Mon Sep 17 00:00:00 2001
+From 09775db2eba2bf964203c73d03b9d91d7e15c324 Mon Sep 17 00:00:00 2001
 From: Seungwoo Yang <ysw.yang@lge.com>
 Date: Wed, 22 Jun 2016 12:35:12 +0900
 Subject: [PATCH] Fix the wifi connection failure
@@ -32,10 +32,10 @@ Tested-by: Rajesh Kanna <rajesh.kanna@lge.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/src/service.c b/src/service.c
-index 66160cc7..ac7a140f 100644
+index ce51034e..1de32aee 100644
 --- a/src/service.c
 +++ b/src/service.c
-@@ -6728,6 +6728,11 @@ int __connman_service_disconnect(struct connman_service *service)
+@@ -6802,6 +6802,11 @@ int __connman_service_disconnect(struct connman_service *service)
  		__connman_ipconfig_set_proxy_autoconfig(service->ipconfig_ipv6,
  							NULL);
  
diff --git a/meta-webos/recipes-connectivity/connman/connman/0010-Implementing-the-configuration-options-related-to-P2.patch b/meta-webos/recipes-connectivity/connman/connman/0010-Implementing-the-configuration-options-related-to-P2.patch
index e9811596e..0671eb408 100644
--- a/meta-webos/recipes-connectivity/connman/connman/0010-Implementing-the-configuration-options-related-to-P2.patch
+++ b/meta-webos/recipes-connectivity/connman/connman/0010-Implementing-the-configuration-options-related-to-P2.patch
@@ -1,4 +1,4 @@
-From 1ebbabeda70e0a3cb8c894f07e105cb139803974 Mon Sep 17 00:00:00 2001
+From c7388ec92e48c2b8d37ded43261f03c0797e022e Mon Sep 17 00:00:00 2001
 From: "sungmok.shin" <sungmok.shin@lge.com>
 Date: Tue, 21 Apr 2020 09:27:33 +0900
 Subject: [PATCH] Implementing the configuration options related to P2P
@@ -64,10 +64,10 @@ index c95ca62b..8c008319 100644
  	data->user_data = user_data;
  
 diff --git a/plugins/wifi.c b/plugins/wifi.c
-index f5a6bc6e..c76ae2be 100644
+index 7e5e33ee..9efc7842 100644
 --- a/plugins/wifi.c
 +++ b/plugins/wifi.c
-@@ -1590,6 +1590,27 @@ static void interface_create_callback(int result,
+@@ -1618,6 +1618,27 @@ static void interface_create_callback(int result,
  	}
  }
  
@@ -95,7 +95,7 @@ index f5a6bc6e..c76ae2be 100644
  static int wifi_enable(struct connman_device *device)
  {
  	struct wifi_data *wifi = connman_device_get_data(device);
-@@ -1608,7 +1629,8 @@ static int wifi_enable(struct connman_device *device)
+@@ -1636,7 +1657,8 @@ static int wifi_enable(struct connman_device *device)
  		return -EINPROGRESS;
  
  	interface = connman_inet_ifname(index);
@@ -105,7 +105,7 @@ index f5a6bc6e..c76ae2be 100644
  						interface_create_callback,
  							wifi);
  	g_free(interface);
-@@ -3837,7 +3859,7 @@ static void sta_remove_callback(int result,
+@@ -3888,7 +3910,7 @@ static void sta_remove_callback(int result,
  
  	info->wifi->interface = NULL;
  
diff --git a/meta-webos/recipes-connectivity/connman/connman/0011-Read-WpaSupplicantConfigFile-from-main-configuration.patch b/meta-webos/recipes-connectivity/connman/connman/0011-Read-WpaSupplicantConfigFile-from-main-configuration.patch
index b3263ca00..9d59cefa6 100644
--- a/meta-webos/recipes-connectivity/connman/connman/0011-Read-WpaSupplicantConfigFile-from-main-configuration.patch
+++ b/meta-webos/recipes-connectivity/connman/connman/0011-Read-WpaSupplicantConfigFile-from-main-configuration.patch
@@ -1,4 +1,4 @@
-From dda535acdcd6bf9e40e3adb557e6519e840324cf Mon Sep 17 00:00:00 2001
+From 82897fde64e0eb2caf8fbef9dc6453c72d1709ab Mon Sep 17 00:00:00 2001
 From: "sungmok.shin" <sungmok.shin@lge.com>
 Date: Tue, 4 Aug 2020 09:42:25 +0900
 Subject: [PATCH] Read WpaSupplicantConfigFile from main configuration
@@ -22,10 +22,10 @@ index a8820217..3c87e77d 100644
  unsigned int *connman_setting_get_uint_list(const char *key);
  
 diff --git a/plugins/wifi.c b/plugins/wifi.c
-index c76ae2be..429a50c4 100644
+index 9efc7842..cc48ceb1 100644
 --- a/plugins/wifi.c
 +++ b/plugins/wifi.c
-@@ -1590,27 +1590,6 @@ static void interface_create_callback(int result,
+@@ -1618,27 +1618,6 @@ static void interface_create_callback(int result,
  	}
  }
  
@@ -53,7 +53,7 @@ index c76ae2be..429a50c4 100644
  static int wifi_enable(struct connman_device *device)
  {
  	struct wifi_data *wifi = connman_device_get_data(device);
-@@ -1629,7 +1608,7 @@ static int wifi_enable(struct connman_device *device)
+@@ -1657,7 +1636,7 @@ static int wifi_enable(struct connman_device *device)
  		return -EINPROGRESS;
  
  	interface = connman_inet_ifname(index);
@@ -63,7 +63,7 @@ index c76ae2be..429a50c4 100644
  						interface_create_callback,
  							wifi);
 diff --git a/src/main.c b/src/main.c
-index 2371771f..c579fa18 100644
+index 94afc1d9..5affe0e7 100644
 --- a/src/main.c
 +++ b/src/main.c
 @@ -83,6 +83,7 @@ static struct {
@@ -90,7 +90,7 @@ index 2371771f..c579fa18 100644
  #define CONF_TETHERING_TECHNOLOGIES      "TetheringTechnologies"
  #define CONF_PERSISTENT_TETHERING_MODE  "PersistentTetheringMode"
  #define CONF_ENABLE_6TO4                "Enable6to4"
-@@ -150,6 +153,7 @@ static const char *supported_options[] = {
+@@ -151,6 +154,7 @@ static const char *supported_options[] = {
  	CONF_ALLOW_HOSTNAME_UPDATES,
  	CONF_ALLOW_DOMAINNAME_UPDATES,
  	CONF_SINGLE_TECH,
@@ -98,7 +98,7 @@ index 2371771f..c579fa18 100644
  	CONF_TETHERING_TECHNOLOGIES,
  	CONF_PERSISTENT_TETHERING_MODE,
  	CONF_ENABLE_6TO4,
-@@ -279,6 +283,7 @@ static void parse_config(GKeyFile *config)
+@@ -280,6 +284,7 @@ static void parse_config(GKeyFile *config)
  	char **timeservers;
  	char **interfaces;
  	char **str_list;
@@ -106,7 +106,7 @@ index 2371771f..c579fa18 100644
  	char **tethering;
          char *vendor_class_id;
  	gsize len;
-@@ -417,6 +422,13 @@ static void parse_config(GKeyFile *config)
+@@ -418,6 +423,13 @@ static void parse_config(GKeyFile *config)
  
  	g_clear_error(&error);
  
@@ -120,7 +120,7 @@ index 2371771f..c579fa18 100644
  	tethering = __connman_config_get_string_list(config, "General",
  			CONF_TETHERING_TECHNOLOGIES, &len, &error);
  
-@@ -698,6 +710,14 @@ bool connman_setting_get_bool(const char *key)
+@@ -699,6 +711,14 @@ bool connman_setting_get_bool(const char *key)
  	return false;
  }