Skip to content

L
linux
Commit 964dc9e2 authored by Johannes Berg's avatar Johannes Berg
Browse files
Options

cfg80211: take WoWLAN support information out of wiphy struct 

There's no need to take up the space for devices that don't
support WoWLAN, and most drivers can even make the support
data static const (except where it's modified at runtime.)
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent e05ecccd
Hide whitespace changes
Inline Side-by-side
Showing with 115 additions and 92 deletions
drivers/net/wireless/ath/ath6kl/cfg80211.c
View file @ 964dc9e2
...@@ -3679,6 +3679,20 @@ struct wireless_dev *ath6kl_interface_add(struct ath6kl *ar, const char *name, ...@@ -3679,6 +3679,20 @@ struct wireless_dev *ath6kl_interface_add(struct ath6kl *ar, const char *name,
return NULL; return NULL;
} }
#ifdef CONFIG_PM
static const struct wiphy_wowlan_support ath6kl_wowlan_support = {
.flags = WIPHY_WOWLAN_MAGIC_PKT |
WIPHY_WOWLAN_DISCONNECT |
WIPHY_WOWLAN_GTK_REKEY_FAILURE |
WIPHY_WOWLAN_SUPPORTS_GTK_REKEY |
WIPHY_WOWLAN_EAP_IDENTITY_REQ |
WIPHY_WOWLAN_4WAY_HANDSHAKE,
.n_patterns = WOW_MAX_FILTERS_PER_LIST,
.pattern_min_len = 1,
.pattern_max_len = WOW_PATTERN_SIZE,
};
#endif
int ath6kl_cfg80211_init(struct ath6kl *ar) int ath6kl_cfg80211_init(struct ath6kl *ar)
{ {
struct wiphy *wiphy = ar->wiphy; struct wiphy *wiphy = ar->wiphy;
...@@ -3772,15 +3786,7 @@ int ath6kl_cfg80211_init(struct ath6kl *ar) ...@@ -3772,15 +3786,7 @@ int ath6kl_cfg80211_init(struct ath6kl *ar)
wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites); wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites);
#ifdef CONFIG_PM #ifdef CONFIG_PM
wiphy->wowlan.flags = WIPHY_WOWLAN_MAGIC_PKT | wiphy->wowlan = &ath6kl_wowlan_support;
WIPHY_WOWLAN_DISCONNECT |
WIPHY_WOWLAN_GTK_REKEY_FAILURE |
WIPHY_WOWLAN_SUPPORTS_GTK_REKEY |
WIPHY_WOWLAN_EAP_IDENTITY_REQ |
WIPHY_WOWLAN_4WAY_HANDSHAKE;
wiphy->wowlan.n_patterns = WOW_MAX_FILTERS_PER_LIST;
wiphy->wowlan.pattern_min_len = 1;
wiphy->wowlan.pattern_max_len = WOW_PATTERN_SIZE;
#endif #endif
wiphy->max_sched_scan_ssids = MAX_PROBED_SSIDS; wiphy->max_sched_scan_ssids = MAX_PROBED_SSIDS;
......
drivers/net/wireless/ath/ath9k/init.c
View file @ 964dc9e2
...@@ -755,6 +755,15 @@ static const struct ieee80211_iface_combination if_comb[] = { ...@@ -755,6 +755,15 @@ static const struct ieee80211_iface_combination if_comb[] = {
} }
}; };
#ifdef CONFIG_PM
static const struct wiphy_wowlan_support ath9k_wowlan_support = {
.flags = WIPHY_WOWLAN_MAGIC_PKT | WIPHY_WOWLAN_DISCONNECT,
.n_patterns = MAX_NUM_USER_PATTERN,
.pattern_min_len = 1,
.pattern_max_len = MAX_PATTERN_SIZE,
};
#endif
void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
{ {
struct ath_hw *ah = sc->sc_ah; struct ath_hw *ah = sc->sc_ah;
...@@ -797,15 +806,8 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) ...@@ -797,15 +806,8 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
if ((ah->caps.hw_caps & ATH9K_HW_WOW_DEVICE_CAPABLE) && if ((ah->caps.hw_caps & ATH9K_HW_WOW_DEVICE_CAPABLE) &&
device_can_wakeup(sc->dev)) { device_can_wakeup(sc->dev))
hw->wiphy->wowlan = &ath9k_wowlan_support;
hw->wiphy->wowlan.flags = WIPHY_WOWLAN_MAGIC_PKT |
WIPHY_WOWLAN_DISCONNECT;
hw->wiphy->wowlan.n_patterns = MAX_NUM_USER_PATTERN;
hw->wiphy->wowlan.pattern_min_len = 1;
hw->wiphy->wowlan.pattern_max_len = MAX_PATTERN_SIZE;
}
atomic_set(&sc->wow_sleep_proc_intr, -1); atomic_set(&sc->wow_sleep_proc_intr, -1);
atomic_set(&sc->wow_got_bmiss_intr, -1); atomic_set(&sc->wow_got_bmiss_intr, -1);
......
drivers/net/wireless/iwlwifi/dvm/dev.h
View file @ 964dc9e2
...@@ -870,6 +870,9 @@ struct iwl_priv { ...@@ -870,6 +870,9 @@ struct iwl_priv {
__le64 replay_ctr; __le64 replay_ctr;
__le16 last_seq_ctl; __le16 last_seq_ctl;
bool have_rekey_data; bool have_rekey_data;
#ifdef CONFIG_PM_SLEEP
struct wiphy_wowlan_support wowlan_support;
#endif
/* device_pointers: pointers to ucode event tables */ /* device_pointers: pointers to ucode event tables */
struct { struct {
......
drivers/net/wireless/iwlwifi/dvm/mac80211.c
View file @ 964dc9e2
...@@ -208,20 +208,21 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv, ...@@ -208,20 +208,21 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,
priv->trans->ops->d3_suspend && priv->trans->ops->d3_suspend &&
priv->trans->ops->d3_resume && priv->trans->ops->d3_resume &&
device_can_wakeup(priv->trans->dev)) { device_can_wakeup(priv->trans->dev)) {
hw->wiphy->wowlan.flags = WIPHY_WOWLAN_MAGIC_PKT | priv->wowlan_support.flags = WIPHY_WOWLAN_MAGIC_PKT |
WIPHY_WOWLAN_DISCONNECT | WIPHY_WOWLAN_DISCONNECT |
WIPHY_WOWLAN_EAP_IDENTITY_REQ | WIPHY_WOWLAN_EAP_IDENTITY_REQ |
WIPHY_WOWLAN_RFKILL_RELEASE; WIPHY_WOWLAN_RFKILL_RELEASE;
if (!iwlwifi_mod_params.sw_crypto) if (!iwlwifi_mod_params.sw_crypto)
hw->wiphy->wowlan.flags |= priv->wowlan_support.flags |=
WIPHY_WOWLAN_SUPPORTS_GTK_REKEY | WIPHY_WOWLAN_SUPPORTS_GTK_REKEY |
WIPHY_WOWLAN_GTK_REKEY_FAILURE; WIPHY_WOWLAN_GTK_REKEY_FAILURE;
hw->wiphy->wowlan.n_patterns = IWLAGN_WOWLAN_MAX_PATTERNS; priv->wowlan_support.n_patterns = IWLAGN_WOWLAN_MAX_PATTERNS;
hw->wiphy->wowlan.pattern_min_len = priv->wowlan_support.pattern_min_len =
IWLAGN_WOWLAN_MIN_PATTERN_LEN; IWLAGN_WOWLAN_MIN_PATTERN_LEN;
hw->wiphy->wowlan.pattern_max_len = priv->wowlan_support.pattern_max_len =
IWLAGN_WOWLAN_MAX_PATTERN_LEN; IWLAGN_WOWLAN_MAX_PATTERN_LEN;
hw->wiphy->wowlan = &priv->wowlan_support;
} }
#endif #endif
......
drivers/net/wireless/iwlwifi/mvm/mac80211.c
View file @ 964dc9e2
...@@ -222,20 +222,20 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) ...@@ -222,20 +222,20 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
mvm->trans->ops->d3_suspend && mvm->trans->ops->d3_suspend &&
mvm->trans->ops->d3_resume && mvm->trans->ops->d3_resume &&
device_can_wakeup(mvm->trans->dev)) { device_can_wakeup(mvm->trans->dev)) {
hw->wiphy->wowlan.flags = WIPHY_WOWLAN_MAGIC_PKT | mvm->wowlan.flags = WIPHY_WOWLAN_MAGIC_PKT |
WIPHY_WOWLAN_DISCONNECT | WIPHY_WOWLAN_DISCONNECT |
WIPHY_WOWLAN_EAP_IDENTITY_REQ | WIPHY_WOWLAN_EAP_IDENTITY_REQ |
WIPHY_WOWLAN_RFKILL_RELEASE; WIPHY_WOWLAN_RFKILL_RELEASE;
if (!iwlwifi_mod_params.sw_crypto) if (!iwlwifi_mod_params.sw_crypto)
hw->wiphy->wowlan.flags |= mvm->wowlan.flags |= WIPHY_WOWLAN_SUPPORTS_GTK_REKEY |
WIPHY_WOWLAN_SUPPORTS_GTK_REKEY | WIPHY_WOWLAN_GTK_REKEY_FAILURE |
WIPHY_WOWLAN_GTK_REKEY_FAILURE | WIPHY_WOWLAN_4WAY_HANDSHAKE;
WIPHY_WOWLAN_4WAY_HANDSHAKE;
mvm->wowlan.n_patterns = IWL_WOWLAN_MAX_PATTERNS;
hw->wiphy->wowlan.n_patterns = IWL_WOWLAN_MAX_PATTERNS; mvm->wowlan.pattern_min_len = IWL_WOWLAN_MIN_PATTERN_LEN;
hw->wiphy->wowlan.pattern_min_len = IWL_WOWLAN_MIN_PATTERN_LEN; mvm->wowlan.pattern_max_len = IWL_WOWLAN_MAX_PATTERN_LEN;
hw->wiphy->wowlan.pattern_max_len = IWL_WOWLAN_MAX_PATTERN_LEN; mvm->wowlan.tcp = &iwl_mvm_wowlan_tcp_support;
hw->wiphy->wowlan.tcp = &iwl_mvm_wowlan_tcp_support; hw->wiphy->wowlan = &mvm->wowlan;
} }
#endif #endif
......
drivers/net/wireless/iwlwifi/mvm/mvm.h
View file @ 964dc9e2
...@@ -336,6 +336,7 @@ struct iwl_mvm { ...@@ -336,6 +336,7 @@ struct iwl_mvm {
struct ieee80211_vif *p2p_device_vif; struct ieee80211_vif *p2p_device_vif;
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
struct wiphy_wowlan_support wowlan;
int gtk_ivlen, gtk_icvlen, ptk_ivlen, ptk_icvlen; int gtk_ivlen, gtk_icvlen, ptk_ivlen, ptk_icvlen;
#endif #endif
......
drivers/net/wireless/mwifiex/cfg80211.c
View file @ 964dc9e2
...@@ -2426,6 +2426,16 @@ static struct cfg80211_ops mwifiex_cfg80211_ops = { ...@@ -2426,6 +2426,16 @@ static struct cfg80211_ops mwifiex_cfg80211_ops = {
#endif #endif
}; };
#ifdef CONFIG_PM
static const struct wiphy_wowlan_support mwifiex_wowlan_support = {
.flags = WIPHY_WOWLAN_MAGIC_PKT,
.n_patterns = MWIFIEX_MAX_FILTERS,
.pattern_min_len = 1,
.pattern_max_len = MWIFIEX_MAX_PATTERN_LEN,
.max_pkt_offset = MWIFIEX_MAX_OFFSET_LEN,
};
#endif
/* /*
* This function registers the device with CFG802.11 subsystem. * This function registers the device with CFG802.11 subsystem.
* *
...@@ -2483,11 +2493,7 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter) ...@@ -2483,11 +2493,7 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)
wiphy_apply_custom_regulatory(wiphy, &mwifiex_world_regdom_custom); wiphy_apply_custom_regulatory(wiphy, &mwifiex_world_regdom_custom);
#ifdef CONFIG_PM #ifdef CONFIG_PM
wiphy->wowlan.flags = WIPHY_WOWLAN_MAGIC_PKT; wiphy->wowlan = &mwifiex_wowlan_support;
wiphy->wowlan.n_patterns = MWIFIEX_MAX_FILTERS;
wiphy->wowlan.pattern_min_len = 1;
wiphy->wowlan.pattern_max_len = MWIFIEX_MAX_PATTERN_LEN;
wiphy->wowlan.max_pkt_offset = MWIFIEX_MAX_OFFSET_LEN;
#endif #endif
wiphy->probe_resp_offload = NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS | wiphy->probe_resp_offload = NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS |
......
drivers/net/wireless/ti/wlcore/main.c
View file @ 964dc9e2
...@@ -6018,6 +6018,15 @@ int wlcore_free_hw(struct wl1271 *wl) ...@@ -6018,6 +6018,15 @@ int wlcore_free_hw(struct wl1271 *wl)
} }
EXPORT_SYMBOL_GPL(wlcore_free_hw); EXPORT_SYMBOL_GPL(wlcore_free_hw);
#ifdef CONFIG_PM
static const struct wiphy_wowlan_support wlcore_wowlan_support = {
.flags = WIPHY_WOWLAN_ANY,
.n_patterns = WL1271_MAX_RX_FILTERS,
.pattern_min_len = 1,
.pattern_max_len = WL1271_RX_FILTER_MAX_PATTERN_SIZE,
};
#endif
static void wlcore_nvs_cb(const struct firmware *fw, void *context) static void wlcore_nvs_cb(const struct firmware *fw, void *context)
{ {
struct wl1271 *wl = context; struct wl1271 *wl = context;
...@@ -6071,14 +6080,8 @@ static void wlcore_nvs_cb(const struct firmware *fw, void *context) ...@@ -6071,14 +6080,8 @@ static void wlcore_nvs_cb(const struct firmware *fw, void *context)
if (!ret) { if (!ret) {
wl->irq_wake_enabled = true; wl->irq_wake_enabled = true;
device_init_wakeup(wl->dev, 1); device_init_wakeup(wl->dev, 1);
if (pdata->pwr_in_suspend) { if (pdata->pwr_in_suspend)
wl->hw->wiphy->wowlan.flags = WIPHY_WOWLAN_ANY; wl->hw->wiphy->wowlan = &wlcore_wowlan_support;
wl->hw->wiphy->wowlan.n_patterns =
WL1271_MAX_RX_FILTERS;
wl->hw->wiphy->wowlan.pattern_min_len = 1;
wl->hw->wiphy->wowlan.pattern_max_len =
WL1271_RX_FILTER_MAX_PATTERN_SIZE;
}
} }
#endif #endif
disable_irq(wl->irq); disable_irq(wl->irq);
......
include/net/cfg80211.h
View file @ 964dc9e2
...@@ -2654,7 +2654,7 @@ struct wiphy { ...@@ -2654,7 +2654,7 @@ struct wiphy {
u32 hw_version; u32 hw_version;
#ifdef CONFIG_PM #ifdef CONFIG_PM
struct wiphy_wowlan_support wowlan; const struct wiphy_wowlan_support *wowlan;
struct cfg80211_wowlan *wowlan_config; struct cfg80211_wowlan *wowlan_config;
#endif #endif
......
net/mac80211/main.c
View file @ 964dc9e2
...@@ -686,8 +686,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) ...@@ -686,8 +686,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
return -EINVAL; return -EINVAL;
#ifdef CONFIG_PM #ifdef CONFIG_PM
if ((hw->wiphy->wowlan.flags || hw->wiphy->wowlan.n_patterns) && if (hw->wiphy->wowlan && (!local->ops->suspend || !local->ops->resume))
(!local->ops->suspend || !local->ops->resume))
return -EINVAL; return -EINVAL;
#endif #endif
......
net/wireless/core.c
View file @ 964dc9e2
...@@ -449,8 +449,13 @@ int wiphy_register(struct wiphy *wiphy) ...@@ -449,8 +449,13 @@ int wiphy_register(struct wiphy *wiphy)
u16 ifmodes = wiphy->interface_modes; u16 ifmodes = wiphy->interface_modes;
#ifdef CONFIG_PM #ifdef CONFIG_PM
if (WARN_ON((wiphy->wowlan.flags & WIPHY_WOWLAN_GTK_REKEY_FAILURE) && if (WARN_ON(wiphy->wowlan &&
!(wiphy->wowlan.flags & WIPHY_WOWLAN_SUPPORTS_GTK_REKEY))) (wiphy->wowlan->flags & WIPHY_WOWLAN_GTK_REKEY_FAILURE) &&
!(wiphy->wowlan->flags & WIPHY_WOWLAN_SUPPORTS_GTK_REKEY)))
return -EINVAL;
if (WARN_ON(wiphy->wowlan &&
!wiphy->wowlan->flags && !wiphy->wowlan->n_patterns &&
!wiphy->wowlan->tcp))
return -EINVAL; return -EINVAL;
#endif #endif
...@@ -540,12 +545,11 @@ int wiphy_register(struct wiphy *wiphy) ...@@ -540,12 +545,11 @@ int wiphy_register(struct wiphy *wiphy)
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
if (rdev->wiphy.wowlan.n_patterns) { if (WARN_ON(rdev->wiphy.wowlan && rdev->wiphy.wowlan->n_patterns &&
if (WARN_ON(!rdev->wiphy.wowlan.pattern_min_len || (!rdev->wiphy.wowlan->pattern_min_len ||
rdev->wiphy.wowlan.pattern_min_len > rdev->wiphy.wowlan->pattern_min_len >
rdev->wiphy.wowlan.pattern_max_len)) rdev->wiphy.wowlan->pattern_max_len)))
return -EINVAL; return -EINVAL;
}
#endif #endif
/* check and set up bitrates */ /* check and set up bitrates */
......
net/wireless/nl80211.c
View file @ 964dc9e2
...@@ -908,7 +908,7 @@ static int nl80211_put_iface_combinations(struct wiphy *wiphy, ...@@ -908,7 +908,7 @@ static int nl80211_put_iface_combinations(struct wiphy *wiphy,
static int nl80211_send_wowlan_tcp_caps(struct cfg80211_registered_device *rdev, static int nl80211_send_wowlan_tcp_caps(struct cfg80211_registered_device *rdev,
struct sk_buff *msg) struct sk_buff *msg)
{ {
const struct wiphy_wowlan_tcp_support *tcp = rdev->wiphy.wowlan.tcp; const struct wiphy_wowlan_tcp_support *tcp = rdev->wiphy.wowlan->tcp;
struct nlattr *nl_tcp; struct nlattr *nl_tcp;
if (!tcp) if (!tcp)
...@@ -951,37 +951,37 @@ static int nl80211_send_wowlan(struct sk_buff *msg, ...@@ -951,37 +951,37 @@ static int nl80211_send_wowlan(struct sk_buff *msg,
{ {
struct nlattr *nl_wowlan; struct nlattr *nl_wowlan;
if (!dev->wiphy.wowlan.flags && !dev->wiphy.wowlan.n_patterns) if (!dev->wiphy.wowlan)
return 0; return 0;
nl_wowlan = nla_nest_start(msg, NL80211_ATTR_WOWLAN_TRIGGERS_SUPPORTED); nl_wowlan = nla_nest_start(msg, NL80211_ATTR_WOWLAN_TRIGGERS_SUPPORTED);
if (!nl_wowlan) if (!nl_wowlan)
return -ENOBUFS; return -ENOBUFS;
if (((dev->wiphy.wowlan.flags & WIPHY_WOWLAN_ANY) && if (((dev->wiphy.wowlan->flags & WIPHY_WOWLAN_ANY) &&
nla_put_flag(msg, NL80211_WOWLAN_TRIG_ANY)) || nla_put_flag(msg, NL80211_WOWLAN_TRIG_ANY)) ||
((dev->wiphy.wowlan.flags & WIPHY_WOWLAN_DISCONNECT) && ((dev->wiphy.wowlan->flags & WIPHY_WOWLAN_DISCONNECT) &&
nla_put_flag(msg, NL80211_WOWLAN_TRIG_DISCONNECT)) || nla_put_flag(msg, NL80211_WOWLAN_TRIG_DISCONNECT)) ||
((dev->wiphy.wowlan.flags & WIPHY_WOWLAN_MAGIC_PKT) && ((dev->wiphy.wowlan->flags & WIPHY_WOWLAN_MAGIC_PKT) &&
nla_put_flag(msg, NL80211_WOWLAN_TRIG_MAGIC_PKT)) || nla_put_flag(msg, NL80211_WOWLAN_TRIG_MAGIC_PKT)) ||
((dev->wiphy.wowlan.flags & WIPHY_WOWLAN_SUPPORTS_GTK_REKEY) && ((dev->wiphy.wowlan->flags & WIPHY_WOWLAN_SUPPORTS_GTK_REKEY) &&
nla_put_flag(msg, NL80211_WOWLAN_TRIG_GTK_REKEY_SUPPORTED)) || nla_put_flag(msg, NL80211_WOWLAN_TRIG_GTK_REKEY_SUPPORTED)) ||
((dev->wiphy.wowlan.flags & WIPHY_WOWLAN_GTK_REKEY_FAILURE) && ((dev->wiphy.wowlan->flags & WIPHY_WOWLAN_GTK_REKEY_FAILURE) &&
nla_put_flag(msg, NL80211_WOWLAN_TRIG_GTK_REKEY_FAILURE)) || nla_put_flag(msg, NL80211_WOWLAN_TRIG_GTK_REKEY_FAILURE)) ||
((dev->wiphy.wowlan.flags & WIPHY_WOWLAN_EAP_IDENTITY_REQ) && ((dev->wiphy.wowlan->flags & WIPHY_WOWLAN_EAP_IDENTITY_REQ) &&
nla_put_flag(msg, NL80211_WOWLAN_TRIG_EAP_IDENT_REQUEST)) || nla_put_flag(msg, NL80211_WOWLAN_TRIG_EAP_IDENT_REQUEST)) ||
((dev->wiphy.wowlan.flags & WIPHY_WOWLAN_4WAY_HANDSHAKE) && ((dev->wiphy.wowlan->flags & WIPHY_WOWLAN_4WAY_HANDSHAKE) &&
nla_put_flag(msg, NL80211_WOWLAN_TRIG_4WAY_HANDSHAKE)) || nla_put_flag(msg, NL80211_WOWLAN_TRIG_4WAY_HANDSHAKE)) ||
((dev->wiphy.wowlan.flags & WIPHY_WOWLAN_RFKILL_RELEASE) && ((dev->wiphy.wowlan->flags & WIPHY_WOWLAN_RFKILL_RELEASE) &&
nla_put_flag(msg, NL80211_WOWLAN_TRIG_RFKILL_RELEASE))) nla_put_flag(msg, NL80211_WOWLAN_TRIG_RFKILL_RELEASE)))
return -ENOBUFS; return -ENOBUFS;
if (dev->wiphy.wowlan.n_patterns) { if (dev->wiphy.wowlan->n_patterns) {
struct nl80211_wowlan_pattern_support pat = { struct nl80211_wowlan_pattern_support pat = {
.max_patterns = dev->wiphy.wowlan.n_patterns, .max_patterns = dev->wiphy.wowlan->n_patterns,
.min_pattern_len = dev->wiphy.wowlan.pattern_min_len, .min_pattern_len = dev->wiphy.wowlan->pattern_min_len,
.max_pattern_len = dev->wiphy.wowlan.pattern_max_len, .max_pattern_len = dev->wiphy.wowlan->pattern_max_len,
.max_pkt_offset = dev->wiphy.wowlan.max_pkt_offset, .max_pkt_offset = dev->wiphy.wowlan->max_pkt_offset,
}; };
if (nla_put(msg, NL80211_WOWLAN_TRIG_PKT_PATTERN, if (nla_put(msg, NL80211_WOWLAN_TRIG_PKT_PATTERN,
...@@ -7580,8 +7580,7 @@ static int nl80211_get_wowlan(struct sk_buff *skb, struct genl_info *info) ...@@ -7580,8 +7580,7 @@ static int nl80211_get_wowlan(struct sk_buff *skb, struct genl_info *info)
void *hdr; void *hdr;
u32 size = NLMSG_DEFAULT_SIZE; u32 size = NLMSG_DEFAULT_SIZE;
if (!rdev->wiphy.wowlan.flags && !rdev->wiphy.wowlan.n_patterns && if (!rdev->wiphy.wowlan)
!rdev->wiphy.wowlan.tcp)
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (rdev->wiphy.wowlan_config && rdev->wiphy.wowlan_config->tcp) { if (rdev->wiphy.wowlan_config && rdev->wiphy.wowlan_config->tcp) {
...@@ -7654,7 +7653,7 @@ static int nl80211_parse_wowlan_tcp(struct cfg80211_registered_device *rdev, ...@@ -7654,7 +7653,7 @@ static int nl80211_parse_wowlan_tcp(struct cfg80211_registered_device *rdev,
u32 data_size, wake_size, tokens_size = 0, wake_mask_size; u32 data_size, wake_size, tokens_size = 0, wake_mask_size;
int err, port; int err, port;
if (!rdev->wiphy.wowlan.tcp) if (!rdev->wiphy.wowlan->tcp)
return -EINVAL; return -EINVAL;
err = nla_parse(tb, MAX_NL80211_WOWLAN_TCP, err = nla_parse(tb, MAX_NL80211_WOWLAN_TCP,
...@@ -7674,16 +7673,16 @@ static int nl80211_parse_wowlan_tcp(struct cfg80211_registered_device *rdev, ...@@ -7674,16 +7673,16 @@ static int nl80211_parse_wowlan_tcp(struct cfg80211_registered_device *rdev,
return -EINVAL; return -EINVAL;
data_size = nla_len(tb[NL80211_WOWLAN_TCP_DATA_PAYLOAD]); data_size = nla_len(tb[NL80211_WOWLAN_TCP_DATA_PAYLOAD]);
if (data_size > rdev->wiphy.wowlan.tcp->data_payload_max) if (data_size > rdev->wiphy.wowlan->tcp->data_payload_max)
return -EINVAL; return -EINVAL;
if (nla_get_u32(tb[NL80211_WOWLAN_TCP_DATA_INTERVAL]) > if (nla_get_u32(tb[NL80211_WOWLAN_TCP_DATA_INTERVAL]) >
rdev->wiphy.wowlan.tcp->data_interval_max || rdev->wiphy.wowlan->tcp->data_interval_max ||
nla_get_u32(tb[NL80211_WOWLAN_TCP_DATA_INTERVAL]) == 0) nla_get_u32(tb[NL80211_WOWLAN_TCP_DATA_INTERVAL]) == 0)
return -EINVAL; return -EINVAL;
wake_size = nla_len(tb[NL80211_WOWLAN_TCP_WAKE_PAYLOAD]); wake_size = nla_len(tb[NL80211_WOWLAN_TCP_WAKE_PAYLOAD]);
if (wake_size > rdev->wiphy.wowlan.tcp->wake_payload_max) if (wake_size > rdev->wiphy.wowlan->tcp->wake_payload_max)
return -EINVAL; return -EINVAL;
wake_mask_size = nla_len(tb[NL80211_WOWLAN_TCP_WAKE_MASK]); wake_mask_size = nla_len(tb[NL80211_WOWLAN_TCP_WAKE_MASK]);
...@@ -7698,13 +7697,13 @@ static int nl80211_parse_wowlan_tcp(struct cfg80211_registered_device *rdev, ...@@ -7698,13 +7697,13 @@ static int nl80211_parse_wowlan_tcp(struct cfg80211_registered_device *rdev,
if (!tok->len || tokens_size % tok->len) if (!tok->len || tokens_size % tok->len)
return -EINVAL; return -EINVAL;
if (!rdev->wiphy.wowlan.tcp->tok) if (!rdev->wiphy.wowlan->tcp->tok)
return -EINVAL; return -EINVAL;
if (tok->len > rdev->wiphy.wowlan.tcp->tok->max_len) if (tok->len > rdev->wiphy.wowlan->tcp->tok->max_len)
return -EINVAL; return -EINVAL;
if (tok->len < rdev->wiphy.wowlan.tcp->tok->min_len) if (tok->len < rdev->wiphy.wowlan->tcp->tok->min_len)
return -EINVAL; return -EINVAL;
if (tokens_size > rdev->wiphy.wowlan.tcp->tok->bufsize) if (tokens_size > rdev->wiphy.wowlan->tcp->tok->bufsize)
return -EINVAL; return -EINVAL;
if (tok->offset + tok->len > data_size) if (tok->offset + tok->len > data_size)
return -EINVAL; return -EINVAL;
...@@ -7712,7 +7711,7 @@ static int nl80211_parse_wowlan_tcp(struct cfg80211_registered_device *rdev, ...@@ -7712,7 +7711,7 @@ static int nl80211_parse_wowlan_tcp(struct cfg80211_registered_device *rdev,
if (tb[NL80211_WOWLAN_TCP_DATA_PAYLOAD_SEQ]) { if (tb[NL80211_WOWLAN_TCP_DATA_PAYLOAD_SEQ]) {
seq = nla_data(tb[NL80211_WOWLAN_TCP_DATA_PAYLOAD_SEQ]); seq = nla_data(tb[NL80211_WOWLAN_TCP_DATA_PAYLOAD_SEQ]);
if (!rdev->wiphy.wowlan.tcp->seq) if (!rdev->wiphy.wowlan->tcp->seq)
return -EINVAL; return -EINVAL;
if (seq->len == 0 || seq->len > 4) if (seq->len == 0 || seq->len > 4)
return -EINVAL; return -EINVAL;
...@@ -7793,12 +7792,11 @@ static int nl80211_set_wowlan(struct sk_buff *skb, struct genl_info *info) ...@@ -7793,12 +7792,11 @@ static int nl80211_set_wowlan(struct sk_buff *skb, struct genl_info *info)
struct nlattr *tb[NUM_NL80211_WOWLAN_TRIG]; struct nlattr *tb[NUM_NL80211_WOWLAN_TRIG];
struct cfg80211_wowlan new_triggers = {}; struct cfg80211_wowlan new_triggers = {};
struct cfg80211_wowlan *ntrig; struct cfg80211_wowlan *ntrig;
struct wiphy_wowlan_support *wowlan = &rdev->wiphy.wowlan; const struct wiphy_wowlan_support *wowlan = rdev->wiphy.wowlan;
int err, i; int err, i;
bool prev_enabled = rdev->wiphy.wowlan_config; bool prev_enabled = rdev->wiphy.wowlan_config;
if (!rdev->wiphy.wowlan.flags && !rdev->wiphy.wowlan.n_patterns && if (!wowlan)
!rdev->wiphy.wowlan.tcp)
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (!info->attrs[NL80211_ATTR_WOWLAN_TRIGGERS]) { if (!info->attrs[NL80211_ATTR_WOWLAN_TRIGGERS]) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7