cfg80211: remove remain-on-channel channel type

As mwifiex (and mac80211 in the software case) are the
only drivers actually implementing remain-on-channel
with channel type, userspace can't be relying on it.
This is the case, as it's used only for P2P operations
right now.

Rather than adding a flag to tell userspace whether or
not it can actually rely on it, simplify all the code
by removing the ability to use different channel types.
Leave only the validation of the attribute, so that if
we extend it again later (with the needed capability
flag), it can't break userspace sending invalid data.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 8 insertions, 12 deletions

diff --git a/net/wireless/rdev-ops.h b/net/wireless/rdev-ops.h
index 6e5fa659068d..ee54a5aa4381 100644
--- a/net/wireless/rdev-ops.h
+++ b/net/wireless/rdev-ops.h
@@ -600,14 +600,12 @@ static inline int
 rdev_remain_on_channel(struct cfg80211_registered_device *rdev,
                        struct wireless_dev *wdev,
                        struct ieee80211_channel *chan,
-                       enum nl80211_channel_type channel_type,
                        unsigned int duration, u64 *cookie)
 {
         int ret;
-        trace_rdev_remain_on_channel(&rdev->wiphy, wdev, chan, channel_type,
-                                     duration);
+        trace_rdev_remain_on_channel(&rdev->wiphy, wdev, chan, duration);
         ret = rdev->ops->remain_on_channel(&rdev->wiphy, wdev, chan,
-                                            channel_type, duration, cookie);
+                                           duration, cookie);
         trace_rdev_return_int_cookie(&rdev->wiphy, ret, *cookie);
         return ret;
 }
@@ -626,17 +624,15 @@ rdev_cancel_remain_on_channel(struct cfg80211_registered_device *rdev,
 static inline int rdev_mgmt_tx(struct cfg80211_registered_device *rdev,
                                struct wireless_dev *wdev,
                                struct ieee80211_channel *chan, bool offchan,
-                               enum nl80211_channel_type channel_type,
-                               bool channel_type_valid, unsigned int wait,
-                               const u8 *buf, size_t len, bool no_cck,
-                               bool dont_wait_for_ack, u64 *cookie)
+                               unsigned int wait, const u8 *buf, size_t len,
+                               bool no_cck, bool dont_wait_for_ack, u64 *cookie)
 {
         int ret;
-        trace_rdev_mgmt_tx(&rdev->wiphy, wdev, chan, offchan, channel_type,
-                           channel_type_valid, wait, no_cck, dont_wait_for_ack);
+        trace_rdev_mgmt_tx(&rdev->wiphy, wdev, chan, offchan,
+                           wait, no_cck, dont_wait_for_ack);
         ret = rdev->ops->mgmt_tx(&rdev->wiphy, wdev, chan, offchan,
-                                  channel_type, channel_type_valid, wait, buf,
-                                  len, no_cck, dont_wait_for_ack, cookie);
+                                  wait, buf, len, no_cck,
+                                  dont_wait_for_ack, cookie);
         trace_rdev_return_int_cookie(&rdev->wiphy, ret, *cookie);
         return ret;
 }