summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorVAUTRIN Emmanuel (Canal Plus Prestataire) <Emmanuel.VAUTRIN@cpexterne.org>2021-05-06 09:45:01 +0000
committerDaniel Wagner <wagi@monom.org>2021-05-13 11:53:17 +0200
commit1b86c9e256d103c8f483085878149ba6b168ead6 (patch)
treececc302f7d09dea15801f22fad4607185fb3ab27 /plugins
parent5ec2a2cecc9079b77ed6c83e3446220002471870 (diff)
downloadconnman-1b86c9e256d103c8f483085878149ba6b168ead6.tar.gz
main: Cleanup of vendor class id and wifi config options
Ensure homogeneity of config options management by replacing connman_option_get_string() by connman_setting_get_string(), and removing irrelevant option.h header file. Fix a memory leak on vendor class id option.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/wifi.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/plugins/wifi.c b/plugins/wifi.c
index 10cf49e6..e7014510 100644
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -49,7 +49,6 @@
#include <connman/service.h>
#include <connman/peer.h>
#include <connman/log.h>
-#include <connman/option.h>
#include <connman/storage.h>
#include <include/setting.h>
#include <connman/provision.h>
@@ -1585,7 +1584,7 @@ static int wifi_enable(struct connman_device *device)
struct wifi_data *wifi = connman_device_get_data(device);
int index;
char *interface;
- const char *driver = connman_option_get_string("wifi");
+ const char *driver = connman_setting_get_string("wifi");
int ret;
DBG("device %p %p", device, wifi);
@@ -3414,7 +3413,7 @@ static void sta_remove_callback(int result,
void *user_data)
{
struct wifi_tethering_info *info = user_data;
- const char *driver = connman_option_get_string("wifi");
+ const char *driver = connman_setting_get_string("wifi");
DBG("ifname %s result %d ", info->ifname, result);