From 5caf8796cd7d131f97c8d40fec08bd65bf1786cc Mon Sep 17 00:00:00 2001 From: James Prestwood Date: Thu, 15 Aug 2019 13:15:12 -0700 Subject: [PATCH] knownnetworks: move network_info into knownnetworks --- src/knownnetworks.h | 11 ++++++++++- src/network.h | 10 ---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/knownnetworks.h b/src/knownnetworks.h index c4f7ba7c..45153a53 100644 --- a/src/knownnetworks.h +++ b/src/knownnetworks.h @@ -21,7 +21,6 @@ */ enum security; -struct network_info; struct scan_freq_set; enum known_networks_event { @@ -29,6 +28,16 @@ enum known_networks_event { KNOWN_NETWORKS_EVENT_REMOVED, }; +struct network_info { + char ssid[33]; + enum security type; + struct l_queue *known_frequencies; + struct timespec connected_time; /* Time last connected */ + int seen_count; /* Ref count for network.info */ + bool is_hidden:1; + bool is_autoconnectable:1; +}; + typedef bool (*known_networks_foreach_func_t)(const struct network_info *info, void *user_data); diff --git a/src/network.h b/src/network.h index 64f523b2..0e8a3b7c 100644 --- a/src/network.h +++ b/src/network.h @@ -75,13 +75,3 @@ void network_connect_new_hidden_network(struct network *network, struct l_dbus_message *message); void network_blacklist_add(struct network *network, struct scan_bss *bss); - -struct network_info { - char ssid[33]; - enum security type; - struct l_queue *known_frequencies; - struct timespec connected_time; /* Time last connected */ - int seen_count; /* Ref count for network.info */ - bool is_hidden:1; - bool is_autoconnectable:1; -};