colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform/wifi: drop *_get_wowlan()

Browse Source 
It's redundant and was probably just left in a an oversight.
*_get_wake_on_wlan() now does the same thing.
This commit is contained in:
Lubomir Rintel
2018-06-25 11:24:54 +02:00
parent cee8b56d3f
commit 2c3a14fed3
5 changed files with 1 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/platform/nm-linux-platform.c
View File

@@ -6191,7 +6191,7 @@ link_get_wake_on_lan (NMPlatform *platform, int ifindex)
if (!wifi_data) if (!wifi_data)
return FALSE; 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 } else
return FALSE; return FALSE;
} }

39
src/platform/wifi/wifi-utils-nl80211.c
View File

@@ -693,44 +693,6 @@ nla_put_failure:
return FALSE; 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 { struct nl80211_device_info {
int phy; int phy;
guint32 *freqs; guint32 *freqs;
@@ -949,7 +911,6 @@ wifi_nl80211_init (int ifindex)
.get_bssid = wifi_nl80211_get_bssid, .get_bssid = wifi_nl80211_get_bssid,
.get_rate = wifi_nl80211_get_rate, .get_rate = wifi_nl80211_get_rate,
.get_qual = wifi_nl80211_get_qual, .get_qual = wifi_nl80211_get_qual,
.get_wowlan = wifi_nl80211_get_wowlan,
.indicate_addressing_running = wifi_nl80211_indicate_addressing_running, .indicate_addressing_running = wifi_nl80211_indicate_addressing_running,
.deinit = wifi_nl80211_deinit, .deinit = wifi_nl80211_deinit,
}; };

2
src/platform/wifi/wifi-utils-private.h
View File

@@ -58,8 +58,6 @@ typedef struct {
void (*deinit) (WifiData *data); void (*deinit) (WifiData *data);
gboolean (*get_wowlan) (WifiData *data);
/* OLPC Mesh-only functions */ /* OLPC Mesh-only functions */
guint32 (*get_mesh_channel) (WifiData *data); guint32 (*get_mesh_channel) (WifiData *data);

10
src/platform/wifi/wifi-utils.c
View File

@@ -170,16 +170,6 @@ wifi_utils_get_qual (WifiData *data)
return data->klass->get_qual (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 void
wifi_utils_unref (WifiData *data) wifi_utils_unref (WifiData *data)
{ {

3
src/platform/wifi/wifi-utils.h
View File

@@ -62,9 +62,6 @@ int wifi_utils_get_qual (WifiData *data);
/* Tells the driver DHCP or SLAAC is running */ /* Tells the driver DHCP or SLAAC is running */
gboolean wifi_utils_indicate_addressing_running (WifiData *data, gboolean 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); gboolean wifi_utils_set_powersave (WifiData *data, guint32 powersave);
NMSettingWirelessWakeOnWLan wifi_utils_get_wake_on_wlan (WifiData *data); NMSettingWirelessWakeOnWLan wifi_utils_get_wake_on_wlan (WifiData *data);