Merge tag 'iommu-updates-v3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro...

[karo-tx-linux.git] / net / wireless / rdev-ops.h

diff --git a/net/wireless/rdev-ops.h b/net/wireless/rdev-ops.h
index 6e5fa659068dfa50b556f48f146fc3ee6da4e9b0..6c0c8191f83771e361fd1f4a14424383d347d7f6 100644 (file)
--- a/net/wireless/rdev-ops.h
+++ b/net/wireless/rdev-ops.h
@@ -359,12 +359,11 @@ rdev_libertas_set_mesh_channel(struct cfg80211_registered_device *rdev,
 
 static inline int
 rdev_set_monitor_channel(struct cfg80211_registered_device *rdev,
-                        struct ieee80211_channel *chan,
-                        enum nl80211_channel_type channel_type)
+                        struct cfg80211_chan_def *chandef)
 {
        int ret;
-       trace_rdev_set_monitor_channel(&rdev->wiphy, chan, channel_type);
-       ret = rdev->ops->set_monitor_channel(&rdev->wiphy, chan, channel_type);
+       trace_rdev_set_monitor_channel(&rdev->wiphy, chandef);
+       ret = rdev->ops->set_monitor_channel(&rdev->wiphy, chandef);
        trace_rdev_return_int(&rdev->wiphy, ret);
        return ret;
 }
@@ -600,14 +599,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 +623,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;
 }
@@ -848,14 +843,17 @@ static inline void rdev_get_et_strings(struct cfg80211_registered_device *rdev,
        trace_rdev_return_void(&rdev->wiphy);
 }
 
-static inline struct ieee80211_channel
-*rdev_get_channel(struct cfg80211_registered_device *rdev,
-                 struct wireless_dev *wdev, enum nl80211_channel_type *type)
+static inline int
+rdev_get_channel(struct cfg80211_registered_device *rdev,
+                struct wireless_dev *wdev,
+                struct cfg80211_chan_def *chandef)
 {
-       struct ieee80211_channel *ret;
+       int ret;
+
        trace_rdev_get_channel(&rdev->wiphy, wdev);
-       ret = rdev->ops->get_channel(&rdev->wiphy, wdev, type);
-       trace_rdev_return_channel(&rdev->wiphy, ret, *type);
+       ret = rdev->ops->get_channel(&rdev->wiphy, wdev, chandef);
+       trace_rdev_return_chandef(&rdev->wiphy, ret, chandef);
+
        return ret;
 }