wifi: nl80211: reject S1G/60G with HT chantype

This configuration doesn't make sense, neither S1G nor
60G have 20 or 40 MHz channel width. Reject it to not
run into the new cfg80211_chandef_create() warning.

Fixes: 92d77e06e73c ("wifi: cfg80211: restrict cfg80211_chandef_create() to only HT-based bands")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 3e867930e253c229911bd02b106d1dfe654c7f9b..d2ef13ab1a20c4aad80c4d202cf8855d3d62213a 100644 (file)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -3634,6 +3634,9 @@ static int _nl80211_parse_chandef(struct cfg80211_registered_device *rdev,
                case NL80211_CHAN_HT20:
                case NL80211_CHAN_HT40PLUS:
                case NL80211_CHAN_HT40MINUS:
+                       if (chandef->chan->band == NL80211_BAND_60GHZ ||
+                           chandef->chan->band == NL80211_BAND_S1GHZ)
+                               return -EINVAL;
                        cfg80211_chandef_create(chandef, chandef->chan,
                                                chantype);
                        /* user input for center_freq is incorrect */