platform/wifi: drop *_get_wowlan()

It's redundant and was probably just left in a an oversight.
*_get_wake_on_wlan() now does the same thing.

5 files changed, 1 insertions, 55 deletions

diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
index 33a05ab12..cd733bb48 100644
--- a/src/platform/nm-linux-platform.c
+++ b/src/platform/nm-linux-platform.c
@@ -6191,7 +6191,7 @@ link_get_wake_on_lan (NMPlatform *platform, int ifindex)
 		if (!wifi_data)
 			return FALSE;
 
-		return wifi_utils_get_wowlan (wifi_data);
+		return wifi_utils_get_wake_on_wlan (wifi_data) != NM_SETTING_WIRELESS_WAKE_ON_WLAN_NONE;
 	} else
 		return FALSE;
 }
diff --git a/src/platform/wifi/wifi-utils-nl80211.c b/src/platform/wifi/wifi-utils-nl80211.c
index 518e39cb1..5109ee7ba 100644
--- a/src/platform/wifi/wifi-utils-nl80211.c
+++ b/src/platform/wifi/wifi-utils-nl80211.c
@@ -693,44 +693,6 @@ nla_put_failure:
 	return FALSE;
 }
 
-struct nl80211_wowlan_info {
-	gboolean enabled;
-};
-
-static int
-nl80211_wowlan_handler (struct nl_msg *msg, void *arg)
-{
-	struct nlattr *tb[NL80211_ATTR_MAX + 1];
-	struct genlmsghdr *gnlh = nlmsg_data (nlmsg_hdr (msg));
-	struct nl80211_wowlan_info *info = arg;
-
-	info->enabled = FALSE;
-
-	if (nla_parse (tb, NL80211_ATTR_MAX, genlmsg_attrdata (gnlh, 0),
-	               genlmsg_attrlen (gnlh, 0), NULL) < 0)
-		return NL_SKIP;
-
-	if (tb[NL80211_ATTR_WOWLAN_TRIGGERS])
-		info->enabled = TRUE;
-
-	return NL_SKIP;
-}
-
-static gboolean
-wifi_nl80211_get_wowlan (WifiData *data)
-{
-	WifiDataNl80211 *nl80211 = (WifiDataNl80211 *) data;
-	nm_auto_nlmsg struct nl_msg *msg = NULL;
-	struct nl80211_wowlan_info info;
-
-	if (!nl80211->can_wowlan)
-		return FALSE;
-
-	msg = nl80211_alloc_msg (nl80211, NL80211_CMD_GET_WOWLAN, 0);
-	nl80211_send_and_recv (nl80211, msg, nl80211_wowlan_handler, &info);
-	return info.enabled;
-}
-
 struct nl80211_device_info {
 	int phy;
 	guint32 *freqs;
@@ -949,7 +911,6 @@ wifi_nl80211_init (int ifindex)
 		.get_bssid = wifi_nl80211_get_bssid,
 		.get_rate = wifi_nl80211_get_rate,
 		.get_qual = wifi_nl80211_get_qual,
-		.get_wowlan = wifi_nl80211_get_wowlan,
 		.indicate_addressing_running = wifi_nl80211_indicate_addressing_running,
 		.deinit = wifi_nl80211_deinit,
 	};
diff --git a/src/platform/wifi/wifi-utils-private.h b/src/platform/wifi/wifi-utils-private.h
index dc5dec05c..0fa9e4773 100644
--- a/src/platform/wifi/wifi-utils-private.h
+++ b/src/platform/wifi/wifi-utils-private.h
@@ -58,8 +58,6 @@ typedef struct {
 
 	void (*deinit) (WifiData *data);
 
-	gboolean (*get_wowlan) (WifiData *data);
-
 	/* OLPC Mesh-only functions */
 
 	guint32 (*get_mesh_channel) (WifiData *data);
diff --git a/src/platform/wifi/wifi-utils.c b/src/platform/wifi/wifi-utils.c
index b704be195..eafb9c0fc 100644
--- a/src/platform/wifi/wifi-utils.c
+++ b/src/platform/wifi/wifi-utils.c
@@ -170,16 +170,6 @@ wifi_utils_get_qual (WifiData *data)
 	return data->klass->get_qual (data);
 }
 
-gboolean
-wifi_utils_get_wowlan (WifiData *data)
-{
-	g_return_val_if_fail (data != NULL, 0);
-
-	if (!data->klass->get_wowlan)
-		return FALSE;
-	return data->klass->get_wowlan (data);
-}
-
 void
 wifi_utils_unref (WifiData *data)
 {
diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h
index e454b7174..762a49d9a 100644
--- a/src/platform/wifi/wifi-utils.h
+++ b/src/platform/wifi/wifi-utils.h
@@ -62,9 +62,6 @@ int wifi_utils_get_qual (WifiData *data);
 /* Tells the driver DHCP or SLAAC is running */
 gboolean wifi_utils_indicate_addressing_running (WifiData *data, gboolean running);
 
-/* Returns true if WoWLAN is enabled on device */
-gboolean wifi_utils_get_wowlan (WifiData *data);
-
 gboolean wifi_utils_set_powersave (WifiData *data, guint32 powersave);
 
 NMSettingWirelessWakeOnWLan wifi_utils_get_wake_on_wlan (WifiData *data);