Merge branch 'wireless'

[~andy/linux] / net / wireless / rdev-ops.h

diff --git a/net/wireless/rdev-ops.h b/net/wireless/rdev-ops.h
index 422d38291d66e3eb00c8cf2cdb5b9369182530fd..d77e1c1d3a0ed35770d4da5a1a1be19a93e4a6b2 100644 (file)
--- a/net/wireless/rdev-ops.h
+++ b/net/wireless/rdev-ops.h
@@ -6,11 +6,12 @@
 #include "core.h"
 #include "trace.h"
 
-static inline int rdev_suspend(struct cfg80211_registered_device *rdev)
+static inline int rdev_suspend(struct cfg80211_registered_device *rdev,
+                              struct cfg80211_wowlan *wowlan)
 {
        int ret;
-       trace_rdev_suspend(&rdev->wiphy, rdev->wowlan);
-       ret = rdev->ops->suspend(&rdev->wiphy, rdev->wowlan);
+       trace_rdev_suspend(&rdev->wiphy, wowlan);
+       ret = rdev->ops->suspend(&rdev->wiphy, wowlan);
        trace_rdev_return_int(&rdev->wiphy, ret);
        return ret;
 }
@@ -887,4 +888,17 @@ static inline int rdev_set_mac_acl(struct cfg80211_registered_device *rdev,
        trace_rdev_return_int(&rdev->wiphy, ret);
        return ret;
 }
+
+static inline int rdev_update_ft_ies(struct cfg80211_registered_device *rdev,
+                                    struct net_device *dev,
+                                    struct cfg80211_update_ft_ies_params *ftie)
+{
+       int ret;
+
+       trace_rdev_update_ft_ies(&rdev->wiphy, dev, ftie);
+       ret = rdev->ops->update_ft_ies(&rdev->wiphy, dev, ftie);
+       trace_rdev_return_int(&rdev->wiphy, ret);
+       return ret;
+}
+
 #endif /* __CFG80211_RDEV_OPS */