Skip to content

Commit

Permalink
connman=webos14 (refresh patches to apply on 1.38 version)
Browse files Browse the repository at this point in the history
:Release Notes:

:Detailed Notes:
0020-Add-p2p-changes.patch this massive patch doesn't apply and
needs to be re-worked, looks like wifi.c was also reordered a
bit in it, which makes conflict resolution unnecessary painful.

This p2p patch also uses __connman_storage_open_service API
which was already removed in 1.38, so we need to revert this
change from upstream until connectivity team properly updates
these p2p changes for newer connman.

It also probably unnecessary restores e.g. include/types.h which was
already removed in upstream in 2013 with:
  commit 86d25926c8b6ccf22f261cc17d30fbdb2e4d0d14
  Author: Daniel Wagner <[email protected]>
  Date:   Tue Jul 23 09:11:07 2013 +0200

    build: Remove unsued types.h header

so I wonder how this patch was created.

ERROR: connman-1.38-r0 do_patch: Command Error: 'quilt --quiltrc /data001/jenkins/gecko/clean-engineering-webos/BUILD/work/raspberrypi4-webos-linux-gnueabi/connman/1.38-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0  Output:
Applying patch 0020-Add-p2p-changes.patch
patching file Makefile.am
Hunk webosose#2 succeeded at 128 (offset -1 lines).
patching file gsupplicant/dbus.c
patching file gsupplicant/dbus.h
patching file gsupplicant/gsupplicant.h
Hunk webosose#7 succeeded at 570 (offset 3 lines).
Hunk webosose#8 succeeded at 593 (offset 3 lines).
Hunk webosose#9 succeeded at 627 (offset 3 lines).
Hunk webosose#10 succeeded at 646 (offset 3 lines).
Hunk webosose#11 succeeded at 678 (offset 3 lines).
Hunk webosose#12 succeeded at 697 (offset 3 lines).
patching file gsupplicant/supplicant.c
Hunk webosose#18 succeeded at 1603 (offset 18 lines).
Hunk webosose#19 succeeded at 1821 (offset 18 lines).
Hunk webosose#20 succeeded at 1853 (offset 18 lines).
Hunk webosose#21 succeeded at 1879 (offset 18 lines).
Hunk webosose#22 succeeded at 1975 (offset 18 lines).
Hunk webosose#23 succeeded at 2686 (offset 18 lines).
Hunk webosose#24 succeeded at 2715 (offset 18 lines).
Hunk webosose#25 succeeded at 3136 (offset 18 lines).
Hunk webosose#26 succeeded at 3288 (offset 18 lines).
Hunk webosose#27 succeeded at 3760 (offset 18 lines).
Hunk webosose#28 succeeded at 3794 (offset 18 lines).
Hunk webosose#29 succeeded at 3868 (offset 18 lines).
Hunk webosose#30 succeeded at 3928 (offset 18 lines).
Hunk webosose#31 succeeded at 3944 (offset 18 lines).
Hunk webosose#32 succeeded at 4009 (offset 18 lines).
Hunk webosose#33 succeeded at 4037 (offset 18 lines).
Hunk webosose#34 succeeded at 4061 (offset 18 lines).
Hunk webosose#35 succeeded at 4078 (offset 18 lines).
Hunk #36 succeeded at 4091 (offset 18 lines).
Hunk #37 succeeded at 4107 (offset 18 lines).
Hunk #38 succeeded at 4144 (offset 18 lines).
Hunk #39 succeeded at 4162 (offset 18 lines).
Hunk #40 succeeded at 4215 (offset 18 lines).
Hunk #41 succeeded at 4229 (offset 18 lines).
Hunk #42 succeeded at 4318 (offset 18 lines).
Hunk #43 succeeded at 4460 (offset 18 lines).
Hunk #44 succeeded at 4486 (offset 18 lines).
Hunk #45 succeeded at 4533 (offset 18 lines).
Hunk #46 succeeded at 4587 (offset 18 lines).
Hunk #47 succeeded at 4597 (offset 18 lines).
Hunk #48 succeeded at 4613 (offset 18 lines).
Hunk #49 succeeded at 9245 (offset 18 lines).
Hunk #50 succeeded at 9266 (offset 18 lines).
Hunk #51 succeeded at 9657 (offset 18 lines).
Hunk #52 succeeded at 9676 (offset 18 lines).
Hunk #53 succeeded at 9838 (offset 18 lines).
Hunk #54 succeeded at 9873 (offset 18 lines).
Hunk #55 succeeded at 10143 (offset 18 lines).
Hunk #56 succeeded at 10252 (offset 18 lines).
patching file include/dbus.h
patching file include/device.h
patching file include/group.h
patching file include/network.h
patching file include/peer.h
patching file include/sd.h
patching file include/technology.h
patching file include/types.h
patching file plugins/wifi.c
Hunk webosose#2 succeeded at 63 with fuzz 2 (offset 2 lines).
Hunk webosose#3 succeeded at 75 with fuzz 1 (offset 2 lines).
Hunk webosose#4 succeeded at 177 (offset 2 lines).
Hunk webosose#5 succeeded at 193 (offset 2 lines).
Hunk webosose#6 succeeded at 213 (offset 2 lines).
Hunk webosose#7 FAILED at 262.
Hunk webosose#8 succeeded at 3720 (offset 2 lines).
Hunk webosose#9 succeeded at 3736 (offset 2 lines).
Hunk webosose#10 succeeded at 4063 (offset 2 lines).
Hunk webosose#11 succeeded at 4085 (offset 2 lines).
Hunk webosose#12 succeeded at 4114 (offset 2 lines).
1 out of 12 hunks FAILED -- rejects in file plugins/wifi.c
patching file src/connman.h
Hunk webosose#2 succeeded at 464 (offset -1 lines).
Hunk webosose#3 succeeded at 558 (offset -1 lines).
Hunk webosose#4 succeeded at 574 (offset -1 lines).
Hunk webosose#5 succeeded at 699 (offset -1 lines).
Hunk webosose#6 succeeded at 851 (offset -1 lines).
Hunk webosose#7 succeeded at 1007 (offset -1 lines).
Hunk webosose#8 succeeded at 1024 (offset -1 lines).
Hunk webosose#9 succeeded at 1117 (offset -1 lines).
patching file src/dbus.c
patching file src/device.c
patching file src/dhcp.c
patching file src/group.c
patching file src/ippool.c
patching file src/manager.c
patching file src/network.c
patching file src/p2pgo.c
patching file src/peer.c
patching file src/peer_service.c
patching file src/sd.c
patching file src/service.c
Hunk #1 succeeded at 7280 (offset 126 lines).
patching file src/storage.c
Hunk #1 succeeded at 263 (offset -22 lines).
Hunk webosose#2 succeeded at 281 (offset -22 lines).
Hunk webosose#3 succeeded at 465 (offset -22 lines).
patching file src/technology.c
patching file src/util.c
Patch 0020-Add-p2p-changes.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
[PLAT-137851] CCC: connman=v1.39

Change-Id: Idda857654f73e2ae9523af5e036513b328ab734a
  • Loading branch information
shr-project authored and Hyunjae Shin committed Apr 1, 2021
1 parent 3b8d3c3 commit ef8f2b7
Show file tree
Hide file tree
Showing 19 changed files with 396 additions and 282 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 1419802d7aa4557bec21ea3ee551dc3f83333d4d Mon Sep 17 00:00:00 2001
From 54b1ad24526f7836614c5f753b71ccbf8bb0529f Mon Sep 17 00:00:00 2001
From: Vibhanshu Dhote <[email protected]>
Date: Wed, 21 Feb 2018 16:36:23 +0530
Subject: [PATCH] Add support for the WPS PBS and PIN mode
Expand Down Expand Up @@ -29,12 +29,12 @@ Upstream-Status : Inappropriate [webOS specific]
9 files changed, 611 insertions(+), 20 deletions(-)

diff --git a/gsupplicant/gsupplicant.h b/gsupplicant/gsupplicant.h
index bfb52db7..93560c15 100644
index 7935c3a6..56cd61ee 100644
--- a/gsupplicant/gsupplicant.h
+++ b/gsupplicant/gsupplicant.h
@@ -268,6 +268,10 @@ int g_supplicant_interface_disconnect(GSupplicantInterface *interface,
GSupplicantInterfaceCallback callback,
void *user_data);
@@ -271,6 +271,10 @@ int g_supplicant_interface_disconnect(GSupplicantInterface *interface,
int g_supplicant_interface_set_bss_expiration_age(GSupplicantInterface *interface,
unsigned int bss_expiration_age);

+int g_supplicant_interface_wps_cancel(GSupplicantInterface *interface,
+ GSupplicantInterfaceCallback callback,
Expand All @@ -43,7 +43,7 @@ index bfb52db7..93560c15 100644
int g_supplicant_interface_set_apscan(GSupplicantInterface *interface,
unsigned int ap_scan);

@@ -361,6 +365,7 @@ struct _GSupplicantCallbacks {
@@ -364,6 +368,7 @@ struct _GSupplicantCallbacks {
void (*peer_changed) (GSupplicantPeer *peer,
GSupplicantPeerState state);
void (*peer_request) (GSupplicantPeer *peer);
Expand All @@ -52,7 +52,7 @@ index bfb52db7..93560c15 100644
void (*disconnect_reasoncode)(GSupplicantInterface *interface,
int reasoncode);
diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c
index 6052f7b6..d78deffe 100644
index f56b595f..3398340d 100644
--- a/gsupplicant/supplicant.c
+++ b/gsupplicant/supplicant.c
@@ -723,6 +723,17 @@ static void remove_group(gpointer data)
Expand All @@ -73,7 +73,7 @@ index 6052f7b6..d78deffe 100644
static void remove_interface(gpointer data)
{
GSupplicantInterface *interface = data;
@@ -3010,6 +3021,8 @@ static void signal_wps_event(const char *path, DBusMessageIter *iter)
@@ -3028,6 +3039,8 @@ static void signal_wps_event(const char *path, DBusMessageIter *iter)
dbus_message_iter_next(iter);

supplicant_dbus_property_foreach(iter, wps_event_args, interface);
Expand All @@ -82,7 +82,7 @@ index 6052f7b6..d78deffe 100644
}

static void create_peer_identifier(GSupplicantPeer *peer)
@@ -5137,6 +5150,59 @@ int g_supplicant_interface_connect(GSupplicantInterface *interface,
@@ -5155,6 +5168,59 @@ int g_supplicant_interface_connect(GSupplicantInterface *interface,
return -EINPROGRESS;
}

Expand Down Expand Up @@ -169,18 +169,18 @@ index 7508a9a1..a3095fb7 100644
const char *name;
enum connman_service_type type;
diff --git a/plugins/wifi.c b/plugins/wifi.c
index f8c22be3..ab35c9f0 100644
index fc304e3b..ce761dad 100644
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -62,6 +62,7 @@
@@ -64,6 +64,7 @@
#define CLEANUP_TIMEOUT 8 /* in seconds */
#define INACTIVE_TIMEOUT 12 /* in seconds */
#define FAVORITE_MAXIMUM_RETRIES 2
+#define WPS_CONNECT_TIMEOUT 120 /* in seconds */

#define BGSCAN_DEFAULT "simple:30:-45:300"
#define BGSCAN_DEFAULT "simple:30:-65:300"
#define AUTOSCAN_EXPONENTIAL "exponential:3:300"
@@ -78,6 +79,8 @@
@@ -80,6 +81,8 @@
static struct connman_technology *wifi_technology = NULL;
static struct connman_technology *p2p_technology = NULL;

Expand All @@ -189,7 +189,7 @@ index f8c22be3..ab35c9f0 100644
enum wifi_ap_capability{
WIFI_AP_UNKNOWN = 0,
WIFI_AP_SUPPORTED = 1,
@@ -161,6 +164,11 @@ struct wifi_data {
@@ -163,6 +166,11 @@ struct wifi_data {
int servicing;
int disconnect_code;
int assoc_code;
Expand All @@ -201,7 +201,7 @@ index f8c22be3..ab35c9f0 100644
};

static GList *iface_list = NULL;
@@ -207,6 +215,17 @@ static bool is_p2p_connecting(void)
@@ -209,6 +217,17 @@ static bool is_p2p_connecting(void)
return false;
}

Expand All @@ -219,7 +219,7 @@ index f8c22be3..ab35c9f0 100644
static void add_pending_wifi_device(struct wifi_data *wifi)
{
if (g_list_find(pending_wifi_device, wifi))
@@ -783,6 +802,9 @@ static int wifi_probe(struct connman_device *device)
@@ -785,6 +804,9 @@ static int wifi_probe(struct connman_device *device)

wifi->watch = connman_rtnl_add_newlink_watch(wifi->index,
wifi_newlink, device);
Expand All @@ -229,7 +229,7 @@ index f8c22be3..ab35c9f0 100644
if (is_p2p_connecting())
add_pending_wifi_device(wifi);
else
@@ -2028,6 +2050,217 @@ static int wifi_set_regdom(struct connman_device *device, const char *alpha2)
@@ -2030,6 +2052,217 @@ static int wifi_set_regdom(struct connman_device *device, const char *alpha2)
return ret;
}

Expand Down Expand Up @@ -447,7 +447,7 @@ index f8c22be3..ab35c9f0 100644
static struct connman_device_driver wifi_ng_driver = {
.name = "wifi",
.type = CONNMAN_DEVICE_TYPE_WIFI,
@@ -2039,6 +2272,8 @@ static struct connman_device_driver wifi_ng_driver = {
@@ -2041,6 +2274,8 @@ static struct connman_device_driver wifi_ng_driver = {
.scan = wifi_scan,
.stop_scan = wifi_stop_scan,
.set_regdom = wifi_set_regdom,
Expand All @@ -456,7 +456,7 @@ index f8c22be3..ab35c9f0 100644
};

static void system_ready(void)
@@ -2063,6 +2298,23 @@ static int network_probe(struct connman_network *network)
@@ -2065,6 +2300,23 @@ static int network_probe(struct connman_network *network)
return 0;
}

Expand All @@ -480,7 +480,7 @@ index f8c22be3..ab35c9f0 100644
static void network_remove(struct connman_network *network)
{
struct connman_device *device = connman_network_get_device(network);
@@ -2076,6 +2328,10 @@ static void network_remove(struct connman_network *network)
@@ -2078,6 +2330,10 @@ static void network_remove(struct connman_network *network)

if (wifi->network != network)
return;
Expand All @@ -491,7 +491,7 @@ index f8c22be3..ab35c9f0 100644

wifi->network = NULL;
}
@@ -2193,6 +2449,9 @@ static int network_connect(struct connman_network *network)
@@ -2195,6 +2451,9 @@ static int network_connect(struct connman_network *network)
if (!wifi)
return -ENODEV;

Expand All @@ -501,7 +501,7 @@ index f8c22be3..ab35c9f0 100644
ssid = g_try_malloc0(sizeof(GSupplicantSSID));
if (!ssid)
return -ENOMEM;
@@ -2235,12 +2494,10 @@ static void disconnect_callback(int result, GSupplicantInterface *interface,
@@ -2237,12 +2496,10 @@ static void disconnect_callback(int result, GSupplicantInterface *interface,
wifi->disconnecting = false;
wifi->connected = false;

Expand All @@ -517,7 +517,7 @@ index f8c22be3..ab35c9f0 100644
}

static int network_disconnect(struct connman_network *network)
@@ -2375,20 +2632,22 @@ static bool handle_wps_completion(GSupplicantInterface *interface,
@@ -2377,20 +2634,22 @@ static bool handle_wps_completion(GSupplicantInterface *interface,
unsigned int ssid_len, wps_ssid_len;
const char *wps_key;

Expand Down Expand Up @@ -554,7 +554,7 @@ index f8c22be3..ab35c9f0 100644
}

wps_key = g_supplicant_interface_get_wps_key(interface);
@@ -2443,6 +2702,65 @@ static bool handle_4way_handshake_failure(GSupplicantInterface *interface,
@@ -2445,6 +2704,65 @@ static bool handle_4way_handshake_failure(GSupplicantInterface *interface,
return false;
}

Expand Down Expand Up @@ -620,7 +620,7 @@ index f8c22be3..ab35c9f0 100644
static void interface_state(GSupplicantInterface *interface)
{
struct connman_network *network;
@@ -2450,7 +2768,10 @@ static void interface_state(GSupplicantInterface *interface)
@@ -2452,7 +2770,10 @@ static void interface_state(GSupplicantInterface *interface)
struct wifi_data *wifi;
GSupplicantState state = g_supplicant_interface_get_state(interface);
bool wps;
Expand All @@ -631,7 +631,7 @@ index f8c22be3..ab35c9f0 100644

wifi = g_supplicant_interface_get_data(interface);

@@ -2484,6 +2805,23 @@ static void interface_state(GSupplicantInterface *interface)
@@ -2486,6 +2807,23 @@ static void interface_state(GSupplicantInterface *interface)
if (!network)
return;

Expand All @@ -655,31 +655,31 @@ index f8c22be3..ab35c9f0 100644
switch (state) {
case G_SUPPLICANT_STATE_SCANNING:
if (wifi->connected)
@@ -2495,6 +2833,7 @@ static void interface_state(GSupplicantInterface *interface)
@@ -2497,6 +2835,7 @@ static void interface_state(GSupplicantInterface *interface)
case G_SUPPLICANT_STATE_ASSOCIATING:
stop_autoscan(device);

+ connman_device_set_scanning(device, CONNMAN_SERVICE_TYPE_WIFI,FALSE);
if (!wifi->connected)
connman_network_set_associating(network, true);

@@ -2504,6 +2843,7 @@ static void interface_state(GSupplicantInterface *interface)
@@ -2506,6 +2845,7 @@ static void interface_state(GSupplicantInterface *interface)
/* though it should be already stopped: */
stop_autoscan(device);

+ connman_device_set_scanning(device,CONNMAN_SERVICE_TYPE_WIFI,FALSE);
if (!handle_wps_completion(interface, network, device, wifi))
break;

@@ -2512,6 +2852,7 @@ static void interface_state(GSupplicantInterface *interface)
@@ -2514,6 +2854,7 @@ static void interface_state(GSupplicantInterface *interface)
wifi->disconnect_code = 0;
wifi->assoc_code = 0;
wifi->load_shaping_retries = 0;
+ wifi->wps_active = FALSE;
break;

case G_SUPPLICANT_STATE_DISCONNECTED:
@@ -2560,7 +2901,12 @@ static void interface_state(GSupplicantInterface *interface)
@@ -2562,7 +2903,12 @@ static void interface_state(GSupplicantInterface *interface)
}
wifi->disconnecting = false;

Expand All @@ -693,7 +693,7 @@ index f8c22be3..ab35c9f0 100644

break;

@@ -3236,6 +3582,7 @@ static const GSupplicantCallbacks callbacks = {
@@ -3238,6 +3584,7 @@ static const GSupplicantCallbacks callbacks = {
.peer_lost = peer_lost,
.peer_changed = peer_changed,
.peer_request = peer_request,
Expand All @@ -702,10 +702,10 @@ index f8c22be3..ab35c9f0 100644
.disconnect_reasoncode = disconnect_reasoncode,
.assoc_status_code = assoc_status_code,
diff --git a/src/connman.h b/src/connman.h
index 8101c7b2..02c509fd 100644
index 3bdc0dc7..86e481e6 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -567,6 +567,8 @@ enum connman_service_type __connman_device_get_service_type(struct connman_devic
@@ -566,6 +566,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);
Expand Down Expand Up @@ -842,10 +842,10 @@ index 264c5e2d..d3048379 100644
{
struct ifreq ifr;
diff --git a/src/service.c b/src/service.c
index 3202f26c..a6bc6d75 100644
index 2f497d10..58d91d74 100644
--- a/src/service.c
+++ b/src/service.c
@@ -49,6 +49,8 @@ static unsigned int vpn_autoconnect_id = 0;
@@ -55,6 +55,8 @@ static unsigned int vpn_autoconnect_id = 0;
static struct connman_service *current_default = NULL;
static bool services_dirty = false;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 4cea8a12d78453223670f9aedc1d620a57168d3d Mon Sep 17 00:00:00 2001
From a72cc681088bea6ad92642bfb5cc80d7a5738f74 Mon Sep 17 00:00:00 2001
From: "krishna.konwar" <[email protected]>
Date: Fri, 3 Aug 2018 16:17:00 +0530
Subject: [PATCH] Set IPv6 state same as IPV4 on disconnect
Expand All @@ -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 a6bc6d75..8cb095df 100644
index 58d91d74..ff44f9c2 100644
--- a/src/service.c
+++ b/src/service.c
@@ -6168,8 +6168,10 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service,
@@ -6294,8 +6294,10 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service,
if (service->state == CONNMAN_SERVICE_STATE_IDLE)
return -EINVAL;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 3a9d741b9adc23c28f9158bf34498c4d2177a310 Mon Sep 17 00:00:00 2001
From d1c441a09e73f5afb3c9869b67ef753d7c989adb Mon Sep 17 00:00:00 2001
From: Vasu Kantubukta <[email protected]>
Date: Wed, 19 Dec 2018 21:02:59 +0530
Subject: [PATCH] Fix for wifi network switching and unable to connect to open
Expand Down Expand Up @@ -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 ab35c9f0..bd9d2eaf 100644
index ce761dad..246d7335 100644
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -2901,7 +2901,7 @@ static void interface_state(GSupplicantInterface *interface)
@@ -2903,7 +2903,7 @@ static void interface_state(GSupplicantInterface *interface)
}
wifi->disconnecting = false;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 4078b3081de5328deb971a762d3e2fd94dab4b14 Mon Sep 17 00:00:00 2001
From 7983e2d7280ca45b4177d0ad1a965b51d058cd2f Mon Sep 17 00:00:00 2001
From: "sachin.shetty" <[email protected]>
Date: Mon, 24 Jun 2019 16:55:43 +0530
Subject: [PATCH] Multiple wi-fi networks are connected via WPS PIN.
Expand Down Expand Up @@ -29,10 +29,10 @@ Upstream-Status: Inappropriate [webOS specific]
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c
index d78deffe..e8d4d69e 100644
index 3398340d..13e27206 100644
--- a/gsupplicant/supplicant.c
+++ b/gsupplicant/supplicant.c
@@ -2399,7 +2399,7 @@ static void interface_property(const char *key, DBusMessageIter *iter,
@@ -2417,7 +2417,7 @@ static void interface_property(const char *key, DBusMessageIter *iter,
g_strdup(interface->ifname), g_strdup(str));
}
} else if (g_strcmp0(key, "CurrentBSS") == 0) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 2f2b63a0b51a553c0b8ea382bdaeab1b31b7e860 Mon Sep 17 00:00:00 2001
From 0f9973fd0187fd5fb44e4b4f09a1d16eed5a2bcb Mon Sep 17 00:00:00 2001
From: "sungmok.shin" <[email protected]>
Date: Tue, 25 Jun 2019 13:11:11 +0900
Subject: [PATCH] Support additional feature for tethering
Expand Down Expand Up @@ -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 bd9d2eaf..76ae1df7 100644
index 246d7335..fb9f064f 100644
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -3604,16 +3604,25 @@ static void tech_remove(struct connman_technology *technology)
@@ -3606,16 +3606,25 @@ static void tech_remove(struct connman_technology *technology)
static GSupplicantSSID *ssid_ap_init(const char *ssid, const char *passphrase)
{
GSupplicantSSID *ap;
Expand Down Expand Up @@ -71,10 +71,10 @@ index bd9d2eaf..76ae1df7 100644
if (!passphrase || strlen(passphrase) == 0) {
ap->security = G_SUPPLICANT_SECURITY_NONE;
diff --git a/src/connman.h b/src/connman.h
index 02c509fd..cc32d065 100644
index 86e481e6..57f218f9 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -642,6 +642,7 @@ const char *__connman_tethering_get_bridge(void);
@@ -641,6 +641,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);
Expand Down Expand Up @@ -283,7 +283,7 @@ index 0119c2d5..ae494c00 100644
}

diff --git a/src/tethering.c b/src/tethering.c
index e04756ff..99abf46c 100644
index e2687b6e..b465bdd3 100644
--- a/src/tethering.c
+++ b/src/tethering.c
@@ -49,6 +49,7 @@
Expand Down
Loading

0 comments on commit ef8f2b7

Please sign in to comment.