ASoC: fsl_sai: Use devm_platform_get_and_ioremap_resource()

[linux-2.6-microblaze.git] / net / wireless / nl80211.c

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index a5224da..fc9286a 100644 (file)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -313,6 +313,7 @@ nl80211_pmsr_ftm_req_attr_policy[NL80211_PMSR_FTM_REQ_ATTR_MAX + 1] = {
        [NL80211_PMSR_FTM_REQ_ATTR_REQUEST_CIVICLOC] = { .type = NLA_FLAG },
        [NL80211_PMSR_FTM_REQ_ATTR_TRIGGER_BASED] = { .type = NLA_FLAG },
        [NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED] = { .type = NLA_FLAG },
+       [NL80211_PMSR_FTM_REQ_ATTR_LMR_FEEDBACK] = { .type = NLA_FLAG },
 };
 
 static const struct nla_policy
@@ -411,9 +412,10 @@ static const struct nla_policy
 nl80211_fils_discovery_policy[NL80211_FILS_DISCOVERY_ATTR_MAX + 1] = {
        [NL80211_FILS_DISCOVERY_ATTR_INT_MIN] = NLA_POLICY_MAX(NLA_U32, 10000),
        [NL80211_FILS_DISCOVERY_ATTR_INT_MAX] = NLA_POLICY_MAX(NLA_U32, 10000),
-       NLA_POLICY_RANGE(NLA_BINARY,
-                        NL80211_FILS_DISCOVERY_TMPL_MIN_LEN,
-                        IEEE80211_MAX_DATA_LEN),
+       [NL80211_FILS_DISCOVERY_ATTR_TMPL] =
+                       NLA_POLICY_RANGE(NLA_BINARY,
+                                        NL80211_FILS_DISCOVERY_TMPL_MIN_LEN,
+                                        IEEE80211_MAX_DATA_LEN),
 };
 
 static const struct nla_policy