From 02ac96d56c5a9ed3c9dc337d8b73bcddb1d225c7 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 23 Feb 2020 04:21:41 -0800 Subject: [PATCH] connman: refresh the patches to apply cleanly :Release Notes: Resolves the warning from do_patch shown e.g. in: https://forum.webosose.org/t/solved-build-failed-for-rpi4/1011 :Detailed Notes: WARNING: connman-1.35-r0 do_patch: Some of the context lines in patches were ignored. This can lead to incorrectly applied patches. The context lines in the patches can be updated with devtool: devtool modify devtool finish --force-patch-refresh Then the updated patches and the source tree (in devtool's workspace) should be reviewed to make sure the patches apply in the correct place and don't introduce duplicate lines (which can, and does happen when some of the context is ignored). Further information: http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450 Details: Applying patch 0011-Provide-station-information-when-AP-mode.patch patching file gsupplicant/gsupplicant.h patching file gsupplicant/supplicant.c patching file include/technology.h patching file plugins/wifi.c Hunk #1 succeeded at 3286 (offset -1 lines). Hunk #2 succeeded at 3525 (offset -1 lines). patching file src/connman.h patching file src/manager.c patching file src/technology.c Hunk #1 succeeded at 2074 (offset -44 lines). patching file src/tethering.c Hunk #1 succeeded at 29 with fuzz 1. Hunk #2 succeeded at 52 (offset -2 lines). Hunk #3 succeeded at 63 (offset -2 lines). Hunk #4 succeeded at 80 (offset -2 lines). Hunk #5 succeeded at 749 (offset -2 lines). Hunk #6 succeeded at 772 (offset -2 lines). Now at patch 0011-Provide-station-information-when-AP-mode.patch :Testing Performed: :QA Notes: :Issues Addressed: [PLAT-101120] CCC: Blacklist failing recipes Change-Id: I6635cf4d32a17712650fb675a0a1a21ae0554b41 --- .../0004-Support-WPS-PBC-and-PIN-mode.patch | 10 ++--- ...ix-Unable-to-reconnect-to-same-Wi-Fi.patch | 9 ++-- ...work-switching-and-unable-to-connect.patch | 9 ++-- ...i-networks-are-connected-via-WPS-PIN.patch | 6 +-- ...ort-additional-feature-for-tethering.patch | 12 +++--- ...port-channel-frequency-of-scanned-AP.patch | 41 ++++++++---------- ...ide-station-information-when-AP-mode.patch | 43 +++++++++---------- ...r-regarding-connman_tethering_get_st.patch | 13 +++--- ...0013-Fix-the-wifi-connection-failure.patch | 10 ++--- 9 files changed, 66 insertions(+), 87 deletions(-) diff --git a/meta-webos/recipes-connectivity/connman/connman/0004-Support-WPS-PBC-and-PIN-mode.patch b/meta-webos/recipes-connectivity/connman/connman/0004-Support-WPS-PBC-and-PIN-mode.patch index 680f392eb..1d080c7a7 100644 --- a/meta-webos/recipes-connectivity/connman/connman/0004-Support-WPS-PBC-and-PIN-mode.patch +++ b/meta-webos/recipes-connectivity/connman/connman/0004-Support-WPS-PBC-and-PIN-mode.patch @@ -1,4 +1,4 @@ -From 1886b233b6c8ab77066b4a58a88c31738c23fff0 Mon Sep 17 00:00:00 2001 +From 1fdb99a8829b048a0f1a95c5f60ba12c8ce02ed6 Mon Sep 17 00:00:00 2001 From: Vibhanshu Dhote Date: Wed, 21 Feb 2018 16:36:23 +0530 Subject: [PATCH] Add support for the WPS PBS and PIN mode @@ -19,14 +19,14 @@ Upstream-Status : Inappropriate [webOS specific] --- gsupplicant/gsupplicant.h | 5 + - gsupplicant/supplicant.c | 66 ++++++++ + gsupplicant/supplicant.c | 66 +++++++ include/device.h | 2 + include/technology.h | 2 + - plugins/wifi.c | 387 +++++++++++++++++++++++++++++++++++++++++++--- + plugins/wifi.c | 387 ++++++++++++++++++++++++++++++++++++-- src/connman.h | 2 + - src/device.c | 116 ++++++++++++++ + src/device.c | 116 ++++++++++++ src/service.c | 2 + - src/technology.c | 49 ++++++ + src/technology.c | 49 +++++ 9 files changed, 611 insertions(+), 20 deletions(-) diff --git a/gsupplicant/gsupplicant.h b/gsupplicant/gsupplicant.h diff --git a/meta-webos/recipes-connectivity/connman/connman/0006-Fix-Unable-to-reconnect-to-same-Wi-Fi.patch b/meta-webos/recipes-connectivity/connman/connman/0006-Fix-Unable-to-reconnect-to-same-Wi-Fi.patch index b145f8801..f63d77320 100644 --- a/meta-webos/recipes-connectivity/connman/connman/0006-Fix-Unable-to-reconnect-to-same-Wi-Fi.patch +++ b/meta-webos/recipes-connectivity/connman/connman/0006-Fix-Unable-to-reconnect-to-same-Wi-Fi.patch @@ -1,4 +1,4 @@ -From 7408cc223cb168da0d426cb6286ec7f0f920915c Mon Sep 17 00:00:00 2001 +From 63642a04a072f0bff70e202b885b30fb508ee01c Mon Sep 17 00:00:00 2001 From: "krishna.konwar" Date: Fri, 3 Aug 2018 16:17:00 +0530 Subject: [PATCH] Set IPv6 state same as IPV4 on disconnect @@ -18,10 +18,10 @@ Upstream-Status : Inappropriate [webOS specific] 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/service.c b/src/service.c -index 768426b..9bac0d5 100644 +index 13902ba..c7074c9 100644 --- a/src/service.c +++ b/src/service.c -@@ -5803,8 +5803,10 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service, +@@ -6010,8 +6010,10 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service, if (service->state == CONNMAN_SERVICE_STATE_IDLE) return -EINVAL; @@ -33,6 +33,3 @@ index 768426b..9bac0d5 100644 break; --- -2.7.4 - diff --git a/meta-webos/recipes-connectivity/connman/connman/0007-Fix-for-wifi-network-switching-and-unable-to-connect.patch b/meta-webos/recipes-connectivity/connman/connman/0007-Fix-for-wifi-network-switching-and-unable-to-connect.patch index d1b85f160..4f7c47418 100644 --- a/meta-webos/recipes-connectivity/connman/connman/0007-Fix-for-wifi-network-switching-and-unable-to-connect.patch +++ b/meta-webos/recipes-connectivity/connman/connman/0007-Fix-for-wifi-network-switching-and-unable-to-connect.patch @@ -1,4 +1,4 @@ -From b39c2a95428dbc1d827691f1c4ffeb860b875120 Mon Sep 17 00:00:00 2001 +From 527001e9f890be303c8f6426d201571893ee0789 Mon Sep 17 00:00:00 2001 From: Vasu Kantubukta Date: Wed, 19 Dec 2018 21:02:59 +0530 Subject: [PATCH] Fix for wifi network switching and unable to connect to open @@ -33,10 +33,10 @@ Upstream-Status: Inappropriate [webOS specific] 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/wifi.c b/plugins/wifi.c -index 2798de3..863ee97 100644 +index 5d6cbb9..bf22a5d 100644 --- a/plugins/wifi.c +++ b/plugins/wifi.c -@@ -2792,7 +2792,7 @@ static void interface_state(GSupplicantInterface *interface) +@@ -2805,7 +2805,7 @@ static void interface_state(GSupplicantInterface *interface) connman_network_set_associating(network, false); wifi->disconnecting = false; @@ -45,6 +45,3 @@ index 2798de3..863ee97 100644 { /* Set connected to false to allow autoscan to start. */ wifi->connected = FALSE; --- -2.7.4 - diff --git a/meta-webos/recipes-connectivity/connman/connman/0008-Multiple-wi-fi-networks-are-connected-via-WPS-PIN.patch b/meta-webos/recipes-connectivity/connman/connman/0008-Multiple-wi-fi-networks-are-connected-via-WPS-PIN.patch index 5c6f10bec..64b50db17 100644 --- a/meta-webos/recipes-connectivity/connman/connman/0008-Multiple-wi-fi-networks-are-connected-via-WPS-PIN.patch +++ b/meta-webos/recipes-connectivity/connman/connman/0008-Multiple-wi-fi-networks-are-connected-via-WPS-PIN.patch @@ -1,4 +1,4 @@ -From 6bd89c26bd20ce1c61d38282e7359a970674652f Mon Sep 17 00:00:00 2001 +From 67b567cc9796b0e649537d268290d2180c9ab6d2 Mon Sep 17 00:00:00 2001 From: "sachin.shetty" Date: Mon, 24 Jun 2019 16:55:43 +0530 Subject: [PATCH] Multiple wi-fi networks are connected via WPS PIN. @@ -24,6 +24,7 @@ Verified the image. connected via WPS PIN. Upstream-Status: Inappropriate [webOS specific] + --- gsupplicant/supplicant.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -41,6 +42,3 @@ index 736cee3..452492a 100644 } else if (g_strcmp0(key, "CurrentNetwork") == 0) { interface_network_added(iter, interface); } else if (g_strcmp0(key, "BSSs") == 0) { --- -2.7.4 - diff --git a/meta-webos/recipes-connectivity/connman/connman/0009-Support-additional-feature-for-tethering.patch b/meta-webos/recipes-connectivity/connman/connman/0009-Support-additional-feature-for-tethering.patch index 13517d584..3927c10a8 100644 --- a/meta-webos/recipes-connectivity/connman/connman/0009-Support-additional-feature-for-tethering.patch +++ b/meta-webos/recipes-connectivity/connman/connman/0009-Support-additional-feature-for-tethering.patch @@ -1,16 +1,17 @@ -From 1714caa8ce21c5e83d737980df11d6be08d6e3c3 Mon Sep 17 00:00:00 2001 +From 786711a97b845886fbfea648fc3a1a9d11e3beec Mon Sep 17 00:00:00 2001 From: "sungmok.shin" Date: Tue, 25 Jun 2019 13:11:11 +0900 Subject: [PATCH] Support additional feature for tethering Support additional feature for tethering + --- gdhcp/server.c | 3 ++ include/technology.h | 1 + - plugins/wifi.c | 11 ++++- + plugins/wifi.c | 11 +++- src/connman.h | 1 + - src/technology.c | 119 +++++++++++++++++++++++++++++++++++++++++++++--- - src/tethering.c | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++ + src/technology.c | 119 +++++++++++++++++++++++++++++++++++++--- + src/tethering.c | 125 +++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 252 insertions(+), 8 deletions(-) diff --git a/gdhcp/server.c b/gdhcp/server.c @@ -425,6 +426,3 @@ index f3cb36f..69fb7a1 100644 static void setup_tun_interface(unsigned int flags, unsigned change, void *data) { --- -1.9.1 - diff --git a/meta-webos/recipes-connectivity/connman/connman/0010-Support-channel-frequency-of-scanned-AP.patch b/meta-webos/recipes-connectivity/connman/connman/0010-Support-channel-frequency-of-scanned-AP.patch index 241323b06..cf0793c82 100644 --- a/meta-webos/recipes-connectivity/connman/connman/0010-Support-channel-frequency-of-scanned-AP.patch +++ b/meta-webos/recipes-connectivity/connman/connman/0010-Support-channel-frequency-of-scanned-AP.patch @@ -1,4 +1,4 @@ -From 5c558b979b6ac3bb7a1e35b0be989cac0135d738 Mon Sep 17 00:00:00 2001 +From 3f07e5a35bde758e5839bf80836496d489b72db4 Mon Sep 17 00:00:00 2001 From: "sungmok.shin" Date: Wed, 28 Aug 2019 15:35:45 +0900 Subject: [PATCH] Support channel frequency of scanned AP @@ -18,7 +18,7 @@ Support channel frequency of scanned AP 9 files changed, 583 insertions(+), 2 deletions(-) diff --git a/gsupplicant/gsupplicant.h b/gsupplicant/gsupplicant.h -index 77dfe56e..3520ee73 100644 +index 77dfe56..3520ee7 100644 --- a/gsupplicant/gsupplicant.h +++ b/gsupplicant/gsupplicant.h @@ -304,6 +304,14 @@ GSupplicantPeer *g_supplicant_interface_peer_lookup(GSupplicantInterface *interf @@ -55,7 +55,7 @@ index 77dfe56e..3520ee73 100644 const char *g_supplicant_peer_get_path(GSupplicantPeer *peer); const char *g_supplicant_peer_get_identifier(GSupplicantPeer *peer); diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c -index 452492af..fc6074c6 100644 +index 452492a..fc6074c 100644 --- a/gsupplicant/supplicant.c +++ b/gsupplicant/supplicant.c @@ -169,6 +169,10 @@ struct _GSupplicantInterface { @@ -252,7 +252,7 @@ index 452492af..fc6074c6 100644 + return ret; +} diff --git a/include/device.h b/include/device.h -index 140f9bcf..04eb35de 100644 +index 140f9bc..04eb35d 100644 --- a/include/device.h +++ b/include/device.h @@ -72,6 +72,7 @@ void connman_device_set_index(struct connman_device *device, int index); @@ -299,7 +299,7 @@ index 140f9bcf..04eb35de 100644 int connman_device_driver_register(struct connman_device_driver *driver); diff --git a/include/network.h b/include/network.h -index 4fc20c1c..ed61718e 100644 +index 4fc20c1..ed61718 100644 --- a/include/network.h +++ b/include/network.h @@ -27,6 +27,7 @@ @@ -337,10 +337,10 @@ index 4fc20c1c..ed61718e 100644 const char *name); int connman_network_set_strength(struct connman_network *network, diff --git a/plugins/wifi.c b/plugins/wifi.c -index de45e011..c909a2de 100644 +index cbe86a2..39c47b0 100644 --- a/plugins/wifi.c +++ b/plugins/wifi.c -@@ -164,6 +164,12 @@ struct wifi_data { +@@ -163,6 +163,12 @@ struct wifi_data { bool wps_start_deferred; }; @@ -353,7 +353,7 @@ index de45e011..c909a2de 100644 static GList *iface_list = NULL; static GList *pending_wifi_device = NULL; -@@ -175,6 +181,27 @@ static int tech_set_tethering(struct connman_technology *technology, +@@ -174,6 +180,27 @@ static int tech_set_tethering(struct connman_technology *technology, const char *identifier, const char *passphrase, const char *bridge, bool enabled); @@ -381,7 +381,7 @@ index de45e011..c909a2de 100644 static int p2p_tech_probe(struct connman_technology *technology) { p2p_technology = technology; -@@ -2172,6 +2199,52 @@ static int wifi_cancel_wps(struct connman_device *device) +@@ -2171,6 +2198,52 @@ static int wifi_cancel_wps(struct connman_device *device) return cancel_wps(wifi); } @@ -434,7 +434,7 @@ index de45e011..c909a2de 100644 static struct connman_device_driver wifi_ng_driver = { .name = "wifi", .type = CONNMAN_DEVICE_TYPE_WIFI, -@@ -2183,7 +2256,8 @@ static struct connman_device_driver wifi_ng_driver = { +@@ -2182,7 +2255,8 @@ static struct connman_device_driver wifi_ng_driver = { .scan = wifi_scan, .set_regdom = wifi_set_regdom, .start_wps = wifi_start_wps, @@ -444,7 +444,7 @@ index de45e011..c909a2de 100644 }; static void system_ready(void) -@@ -3008,6 +3082,7 @@ static void network_added(GSupplicantNetwork *supplicant_network) +@@ -3007,6 +3081,7 @@ static void network_added(GSupplicantNetwork *supplicant_network) bool wps_pbc; bool wps_ready; bool wps_advertizing; @@ -452,7 +452,7 @@ index de45e011..c909a2de 100644 mode = g_supplicant_network_get_mode(supplicant_network); identifier = g_supplicant_network_get_identifier(supplicant_network); -@@ -3027,6 +3102,7 @@ static void network_added(GSupplicantNetwork *supplicant_network) +@@ -3026,6 +3101,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); @@ -460,7 +460,7 @@ index de45e011..c909a2de 100644 if (!wifi) return; -@@ -3091,6 +3167,11 @@ static void network_added(GSupplicantNetwork *supplicant_network) +@@ -3090,6 +3166,11 @@ static void network_added(GSupplicantNetwork *supplicant_network) wifi->hidden = NULL; } } @@ -472,7 +472,7 @@ index de45e011..c909a2de 100644 } static void network_removed(GSupplicantNetwork *network) -@@ -3126,11 +3207,13 @@ static void network_changed(GSupplicantNetwork *network, const char *property) +@@ -3125,11 +3206,13 @@ static void network_changed(GSupplicantNetwork *network, const char *property) struct wifi_data *wifi; const char *name, *identifier; struct connman_network *connman_network; @@ -486,7 +486,7 @@ index de45e011..c909a2de 100644 DBG("name %s", name); -@@ -3141,6 +3224,11 @@ static void network_changed(GSupplicantNetwork *network, const char *property) +@@ -3140,6 +3223,11 @@ static void network_changed(GSupplicantNetwork *network, const char *property) if (!connman_network) return; @@ -499,7 +499,7 @@ index de45e011..c909a2de 100644 connman_network_set_strength(connman_network, calculate_strength(network)); diff --git a/src/device.c b/src/device.c -index 874e21f7..3e45413b 100644 +index 874e21f..3e45413 100644 --- a/src/device.c +++ b/src/device.c @@ -68,6 +68,11 @@ struct connman_device { @@ -599,7 +599,7 @@ index 874e21f7..3e45413b 100644 { struct ifreq ifr; diff --git a/src/network.c b/src/network.c -index ed56210f..cbbcd91d 100644 +index ed56210..cbbcd91 100644 --- a/src/network.c +++ b/src/network.c @@ -44,6 +44,12 @@ @@ -750,7 +750,7 @@ index ed56210f..cbbcd91d 100644 * connman_network_set_name: * @network: network structure diff --git a/src/service.c b/src/service.c -index c7074c9c..319ecf58 100644 +index c7074c9..319ecf5 100644 --- a/src/service.c +++ b/src/service.c @@ -141,6 +141,7 @@ static struct connman_ipconfig *create_ip4config(struct connman_service *service @@ -857,7 +857,7 @@ index c7074c9c..319ecf58 100644 append_ethernet, service); break; diff --git a/src/technology.c b/src/technology.c -index 75e75ae5..13c64fee 100644 +index 75e75ae..13c64fe 100644 --- a/src/technology.c +++ b/src/technology.c @@ -77,6 +77,7 @@ struct connman_technology { @@ -952,6 +952,3 @@ index 75e75ae5..13c64fee 100644 static const GDBusMethodTable technology_methods[] = { { GDBUS_DEPRECATED_METHOD("GetProperties", NULL, GDBUS_ARGS({ "properties", "a{sv}" }), --- -2.17.1 - diff --git a/meta-webos/recipes-connectivity/connman/connman/0011-Provide-station-information-when-AP-mode.patch b/meta-webos/recipes-connectivity/connman/connman/0011-Provide-station-information-when-AP-mode.patch index b51ef39f6..af1e32341 100644 --- a/meta-webos/recipes-connectivity/connman/connman/0011-Provide-station-information-when-AP-mode.patch +++ b/meta-webos/recipes-connectivity/connman/connman/0011-Provide-station-information-when-AP-mode.patch @@ -1,4 +1,4 @@ -From f79b5418cc2cff7127d702170c4f2cf11eda213e Mon Sep 17 00:00:00 2001 +From ec697c7db8030ea825915e24c81e849d4849df59 Mon Sep 17 00:00:00 2001 From: "sungmok.shin" Date: Sat, 31 Aug 2019 14:41:49 +0900 Subject: [PATCH] Provide station information when AP mode @@ -7,13 +7,13 @@ Provide station information when AP mode --- gsupplicant/gsupplicant.h | 2 + - gsupplicant/supplicant.c | 53 +++++++++++++++++++++++++++ + gsupplicant/supplicant.c | 53 ++++++++++++++++++++++ include/technology.h | 2 + - plugins/wifi.c | 21 +++++++++++ - src/connman.h | 11 ++++++ - src/manager.c | 21 +++++++++++ - src/technology.c | 36 ++++++++++++++++++ - src/tethering.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++ + plugins/wifi.c | 21 +++++++++ + src/connman.h | 11 +++++ + src/manager.c | 21 +++++++++ + src/technology.c | 36 +++++++++++++++ + src/tethering.c | 93 +++++++++++++++++++++++++++++++++++++++ 8 files changed, 239 insertions(+) diff --git a/gsupplicant/gsupplicant.h b/gsupplicant/gsupplicant.h @@ -30,7 +30,7 @@ index 3520ee7..a3e5d51 100644 void (*peer_lost) (GSupplicantPeer *peer); void (*peer_changed) (GSupplicantPeer *peer, diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c -index fc6074c..f9f75a5 100644 +index fc6074c..a4d8257 100644 --- a/gsupplicant/supplicant.c +++ b/gsupplicant/supplicant.c @@ -3031,6 +3031,56 @@ static void signal_wps_event(const char *path, DBusMessageIter *iter) @@ -114,10 +114,10 @@ index d24d765..d5c08e4 100644 void connman_technology_regdom_notify(struct connman_technology *technology, const char *alpha2); diff --git a/plugins/wifi.c b/plugins/wifi.c -index c909a2d..f35337f 100644 +index 39c47b0..c41356d 100644 --- a/plugins/wifi.c +++ b/plugins/wifi.c -@@ -3287,6 +3287,25 @@ static void network_associated(GSupplicantNetwork *network) +@@ -3286,6 +3286,25 @@ static void network_associated(GSupplicantNetwork *network) interface_state(interface); } @@ -143,7 +143,7 @@ index c909a2d..f35337f 100644 static void apply_peer_services(GSupplicantPeer *peer, struct connman_peer *connman_peer) { -@@ -3507,6 +3526,8 @@ static const GSupplicantCallbacks callbacks = { +@@ -3506,6 +3525,8 @@ static const GSupplicantCallbacks callbacks = { .network_removed = network_removed, .network_changed = network_changed, .network_associated = network_associated, @@ -218,10 +218,10 @@ index d15ce20..758ac70 100644 GDBUS_ARGS({ "provider", "o" }), NULL, remove_provider) }, diff --git a/src/technology.c b/src/technology.c -index c31c5fc..9dc95f4 100644 +index 13c64fe..292a533 100644 --- a/src/technology.c +++ b/src/technology.c -@@ -2118,3 +2118,39 @@ void __connman_technology_cleanup(void) +@@ -2074,3 +2074,39 @@ void __connman_technology_cleanup(void) dbus_connection_unref(connection); } @@ -262,7 +262,7 @@ index c31c5fc..9dc95f4 100644 + DBUS_TYPE_STRING, append_station_mac, NULL); +} diff --git a/src/tethering.c b/src/tethering.c -index 3ed3522..75d08f2 100644 +index 69fb7a1..26d71b4 100644 --- a/src/tethering.c +++ b/src/tethering.c @@ -29,6 +29,7 @@ @@ -272,8 +272,8 @@ index 3ed3522..75d08f2 100644 +#include #include #include - #include -@@ -53,6 +54,9 @@ + #include +@@ -51,6 +52,9 @@ #define DEFAULT_MTU 1500 @@ -283,7 +283,7 @@ index 3ed3522..75d08f2 100644 static char *private_network_primary_dns = NULL; static char *private_network_secondary_dns = NULL; -@@ -61,6 +65,7 @@ static GDHCPServer *tethering_dhcp_server = NULL; +@@ -59,6 +63,7 @@ static GDHCPServer *tethering_dhcp_server = NULL; static struct connman_ippool *dhcp_ippool = NULL; static DBusConnection *connection; static GHashTable *pn_hash; @@ -291,7 +291,7 @@ index 3ed3522..75d08f2 100644 struct connman_private_network { char *owner; -@@ -77,6 +82,89 @@ struct connman_private_network { +@@ -75,6 +80,89 @@ struct connman_private_network { char *secondary_dns; }; @@ -381,7 +381,7 @@ index 3ed3522..75d08f2 100644 const char *__connman_tethering_get_bridge(void) { int sk, err; -@@ -663,6 +751,9 @@ int __connman_tethering_init(void) +@@ -661,6 +749,9 @@ int __connman_tethering_init(void) pn_hash = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, remove_private_network); @@ -391,7 +391,7 @@ index 3ed3522..75d08f2 100644 return 0; } -@@ -683,5 +774,7 @@ void __connman_tethering_cleanup(void) +@@ -681,5 +772,7 @@ void __connman_tethering_cleanup(void) return; g_hash_table_destroy(pn_hash); @@ -399,6 +399,3 @@ index 3ed3522..75d08f2 100644 + g_hash_table_destroy(sta_hash); dbus_connection_unref(connection); } --- -1.9.1 - diff --git a/meta-webos/recipes-connectivity/connman/connman/0012-Fix-compile-error-regarding-connman_tethering_get_st.patch b/meta-webos/recipes-connectivity/connman/connman/0012-Fix-compile-error-regarding-connman_tethering_get_st.patch index 7ff3779c5..1670b2474 100644 --- a/meta-webos/recipes-connectivity/connman/connman/0012-Fix-compile-error-regarding-connman_tethering_get_st.patch +++ b/meta-webos/recipes-connectivity/connman/connman/0012-Fix-compile-error-regarding-connman_tethering_get_st.patch @@ -1,4 +1,4 @@ -From 3ed6869711c99640cf70e791e668d31085de34e0 Mon Sep 17 00:00:00 2001 +From d0fbcf1fd2027109025e8f30e6541fa0aee6cebd Mon Sep 17 00:00:00 2001 From: "sungmok.shin" Date: Mon, 23 Sep 2019 23:08:32 +0900 Subject: [PATCH] Fix compile error regarding connman_tethering_get_sta_hash @@ -11,10 +11,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 9dc95f4..951f150 100644 +index 292a533..697224f 100644 --- a/src/technology.c +++ b/src/technology.c -@@ -2123,6 +2123,9 @@ static void append_station_mac(DBusMessageIter *iter, void *user_data) +@@ -2079,6 +2079,9 @@ static void append_station_mac(DBusMessageIter *iter, void *user_data) { GHashTable *sta_hash = __connman_tethering_get_sta_hash(); @@ -25,10 +25,10 @@ index 9dc95f4..951f150 100644 gpointer key, value; g_hash_table_iter_init (&iterator, sta_hash); diff --git a/src/tethering.c b/src/tethering.c -index 75d08f2..d27f15b 100644 +index 26d71b4..a0a9a9d 100644 --- a/src/tethering.c +++ b/src/tethering.c -@@ -163,6 +163,8 @@ GHashTable *__connman_tethering_get_sta_hash() +@@ -161,6 +161,8 @@ GHashTable *__connman_tethering_get_sta_hash() { if (sta_hash != NULL) return sta_hash; @@ -37,6 +37,3 @@ index 75d08f2..d27f15b 100644 } const char *__connman_tethering_get_bridge(void) --- -1.9.1 - diff --git a/meta-webos/recipes-connectivity/connman/connman/0013-Fix-the-wifi-connection-failure.patch b/meta-webos/recipes-connectivity/connman/connman/0013-Fix-the-wifi-connection-failure.patch index ce62ad82b..3a5f0b08e 100644 --- a/meta-webos/recipes-connectivity/connman/connman/0013-Fix-the-wifi-connection-failure.patch +++ b/meta-webos/recipes-connectivity/connman/connman/0013-Fix-the-wifi-connection-failure.patch @@ -1,4 +1,4 @@ -From a8e2ae978dca12b309676ff87a3ccda90524ca0a Mon Sep 17 00:00:00 2001 +From 079c9c521073c6ba36a6f84bb913584c35c11ae5 Mon Sep 17 00:00:00 2001 From: Seungwoo Yang Date: Wed, 22 Jun 2016 12:35:12 +0900 Subject: [PATCH] Fix the wifi connection failure @@ -27,15 +27,16 @@ Change-Id: Ib06f23b8c2cd5a4acbd8fb792156fb139539dd51 Reviewed-on: http://gpro.lgsvl.com/230653 Reviewed-by: Rajesh Kanna Tested-by: Rajesh Kanna + --- src/service.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/service.c b/src/service.c -index edbdd51d..327a8327 100644 +index 319ecf5..52bb2ad 100644 --- a/src/service.c +++ b/src/service.c -@@ -7440,6 +7440,11 @@ int __connman_service_disconnect(struct connman_service *service) +@@ -6436,6 +6436,11 @@ int __connman_service_disconnect(struct connman_service *service) __connman_ipconfig_set_proxy_autoconfig(service->ipconfig_ipv6, NULL); @@ -47,6 +48,3 @@ index edbdd51d..327a8327 100644 __connman_ipconfig_address_remove(service->ipconfig_ipv4); settings_changed(service, service->ipconfig_ipv4); --- -2.17.1 -