From: Gregory Greenman <gregory.greenman@xxxxxxxxx>
For NL80211_ATTR_HE_CAPABILITY we now use NLA_POLICY_VALIDATE_FN(),
so the patch doesn't apply. Fix it.
type=maint
ticket=none
Signed-off-by: Gregory Greenman <gregory.greenman@xxxxxxxxx>
---
patches/0099-netlink-range/mac80211.patch | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/patches/0099-netlink-range/mac80211.patch b/patches/0099-netlink-range/mac80211.patch
index bc55cc2f15bd..58027b0fb124 100644
--- a/patches/0099-netlink-range/mac80211.patch
+++ b/patches/0099-netlink-range/mac80211.patch
@@ -1,6 +1,6 @@
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
-@@ -412,10 +412,15 @@ static const struct nla_policy
+@@ -421,10 +421,15 @@ 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),
@@ -55,19 +55,3 @@
[NL80211_ATTR_MAC_HINT] = NLA_POLICY_EXACT_LEN_WARN(ETH_ALEN),
[NL80211_ATTR_WIPHY_FREQ_HINT] = { .type = NLA_U32 },
[NL80211_ATTR_TDLS_PEER_CAPABILITY] = { .type = NLA_U32 },
-@@ -720,10 +739,15 @@ static const struct nla_policy nl80211_p
- [NL80211_ATTR_TXQ_LIMIT] = { .type = NLA_U32 },
- [NL80211_ATTR_TXQ_MEMORY_LIMIT] = { .type = NLA_U32 },
- [NL80211_ATTR_TXQ_QUANTUM] = { .type = NLA_U32 },
-+#if LINUX_VERSION_IS_GEQ(5,10,0)
- [NL80211_ATTR_HE_CAPABILITY] =
- NLA_POLICY_RANGE(NLA_BINARY,
- NL80211_HE_MIN_CAPABILITY_LEN,
- NL80211_HE_MAX_CAPABILITY_LEN),
-+#else
-+ [NL80211_ATTR_HE_CAPABILITY] = { .type = NLA_BINARY,
-+ .len = NL80211_HE_MAX_CAPABILITY_LEN },
-+#endif
- [NL80211_ATTR_FTM_RESPONDER] =
- NLA_POLICY_NESTED(nl80211_ftm_responder_policy),
- [NL80211_ATTR_TIMEOUT] = NLA_POLICY_MIN(NLA_U32, 1),
--
2.37.3
--
To unsubscribe from this list: send the line "unsubscribe backports" in
