Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-12-22 21:22:37 +01:00
Code Releases Activity

network: Make network_load_settings static

Browse Source
This commit is contained in:
Denis Kenzior 2016-09-19 17:03:51 -05:00
parent 69ea4db15c
commit a239b49707
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/network.c
View File

@ -58,6 +58,22 @@ struct network {
static struct l_queue *networks = NULL; static struct l_queue *networks = NULL;
static bool network_settings_load(struct network *network)
{
const char *strtype;
if (network->settings)
return true;
strtype = security_to_str(network_get_security(network));
if (!strtype)
return false;
network->settings = storage_network_open(strtype, network->info->ssid);
return network->settings != NULL;
}
static int timespec_compare(const void *a, const void *b, void *user_data) static int timespec_compare(const void *a, const void *b, void *user_data)
{ {
const struct network_info *ni_a = a; const struct network_info *ni_a = a;
@ -305,22 +321,6 @@ struct l_settings *network_get_settings(const struct network *network)
return network->settings; return network->settings;
} }
bool network_settings_load(struct network *network)
{
const char *strtype;
if (network->settings)
return true;
strtype = security_to_str(network_get_security(network));
if (!strtype)
return false;
network->settings = storage_network_open(strtype, network->info->ssid);
return network->settings != NULL;
}
void network_sync_psk(struct network *network) void network_sync_psk(struct network *network)
{ {
char *hex; char *hex;

1
src/network.h
View File

@ -44,7 +44,6 @@ const unsigned char *network_get_psk(const struct network *network);
int network_get_signal_strength(const struct network *network); int network_get_signal_strength(const struct network *network);
struct l_settings *network_get_settings(const struct network *network); struct l_settings *network_get_settings(const struct network *network);
bool network_settings_load(struct network *network);
void network_settings_close(struct network *network); void network_settings_close(struct network *network);
void network_sync_psk(struct network *network); void network_sync_psk(struct network *network);