]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
wifi build fix for 6.6
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 15 Aug 2024 12:51:05 +0000 (14:51 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 15 Aug 2024 12:51:05 +0000 (14:51 +0200)
queue-6.6/wifi-cfg80211-restrict-nl80211_attr_txq_quantum-valu.patch

index 7d3d66c5542c690e8cf984d989669bfda82ca662..d8a6cb14c51e12046b754b267ad172825dd3717d 100644 (file)
@@ -90,26 +90,25 @@ Signed-off-by: Eric Dumazet <edumazet@google.com>
 Link: https://patch.msgid.link/20240615160800.250667-1-edumazet@google.com
 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- net/wireless/nl80211.c | 6 +++++-
+ net/wireless/nl80211.c |    6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
-diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
-index be5c42d6ffbea..6ea77ed8dff76 100644
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -468,6 +468,10 @@ static struct netlink_range_validation nl80211_punct_bitmap_range = {
+@@ -468,6 +468,10 @@ static struct netlink_range_validation n
        .max = 0xffff,
  };
  
-+static const struct netlink_range_validation q_range = {
++static struct netlink_range_validation q_range = {
 +      .max = INT_MAX,
 +};
 +
  static const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = {
        [0] = { .strict_start_type = NL80211_ATTR_HE_OBSS_PD },
        [NL80211_ATTR_WIPHY] = { .type = NLA_U32 },
-@@ -750,7 +754,7 @@ static const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = {
+@@ -750,7 +754,7 @@ static const struct nla_policy nl80211_p
  
        [NL80211_ATTR_TXQ_LIMIT] = { .type = NLA_U32 },
        [NL80211_ATTR_TXQ_MEMORY_LIMIT] = { .type = NLA_U32 },
@@ -118,6 +117,3 @@ index be5c42d6ffbea..6ea77ed8dff76 100644
        [NL80211_ATTR_HE_CAPABILITY] =
                NLA_POLICY_VALIDATE_FN(NLA_BINARY, validate_he_capa,
                                       NL80211_HE_MAX_CAPABILITY_LEN),
--- 
-2.43.0
-