diff options
Diffstat (limited to 'net/wireless/rdev-ops.h')
-rw-r--r-- | net/wireless/rdev-ops.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/net/wireless/rdev-ops.h b/net/wireless/rdev-ops.h index 9f15f0ac824d..37ce9fdfe934 100644 --- a/net/wireless/rdev-ops.h +++ b/net/wireless/rdev-ops.h | |||
@@ -516,11 +516,12 @@ static inline void rdev_rfkill_poll(struct cfg80211_registered_device *rdev) | |||
516 | 516 | ||
517 | #ifdef CONFIG_NL80211_TESTMODE | 517 | #ifdef CONFIG_NL80211_TESTMODE |
518 | static inline int rdev_testmode_cmd(struct cfg80211_registered_device *rdev, | 518 | static inline int rdev_testmode_cmd(struct cfg80211_registered_device *rdev, |
519 | struct wireless_dev *wdev, | ||
519 | void *data, int len) | 520 | void *data, int len) |
520 | { | 521 | { |
521 | int ret; | 522 | int ret; |
522 | trace_rdev_testmode_cmd(&rdev->wiphy); | 523 | trace_rdev_testmode_cmd(&rdev->wiphy, wdev); |
523 | ret = rdev->ops->testmode_cmd(&rdev->wiphy, data, len); | 524 | ret = rdev->ops->testmode_cmd(&rdev->wiphy, wdev, data, len); |
524 | trace_rdev_return_int(&rdev->wiphy, ret); | 525 | trace_rdev_return_int(&rdev->wiphy, ret); |
525 | return ret; | 526 | return ret; |
526 | } | 527 | } |
@@ -923,4 +924,16 @@ static inline void rdev_crit_proto_stop(struct cfg80211_registered_device *rdev, | |||
923 | trace_rdev_return_void(&rdev->wiphy); | 924 | trace_rdev_return_void(&rdev->wiphy); |
924 | } | 925 | } |
925 | 926 | ||
927 | static inline int rdev_channel_switch(struct cfg80211_registered_device *rdev, | ||
928 | struct net_device *dev, | ||
929 | struct cfg80211_csa_settings *params) | ||
930 | { | ||
931 | int ret; | ||
932 | |||
933 | trace_rdev_channel_switch(&rdev->wiphy, dev, params); | ||
934 | ret = rdev->ops->channel_switch(&rdev->wiphy, dev, params); | ||
935 | trace_rdev_return_int(&rdev->wiphy, ret); | ||
936 | return ret; | ||
937 | } | ||
938 | |||
926 | #endif /* __CFG80211_RDEV_OPS */ | 939 | #endif /* __CFG80211_RDEV_OPS */ |