Merge remote-tracking branch 'net-next/master' into mac80211-next

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

diff --git a/net/wireless/rdev-ops.h b/net/wireless/rdev-ops.h
index 85ff30b..11cf83c 100644 (file)
--- a/net/wireless/rdev-ops.h
+++ b/net/wireless/rdev-ops.h
@@ -887,6 +887,64 @@ static inline void rdev_stop_p2p_device(struct cfg80211_registered_device *rdev,
        trace_rdev_return_void(&rdev->wiphy);
 }
 
+static inline int rdev_start_nan(struct cfg80211_registered_device *rdev,
+                                struct wireless_dev *wdev,
+                                struct cfg80211_nan_conf *conf)
+{
+       int ret;
+
+       trace_rdev_start_nan(&rdev->wiphy, wdev, conf);
+       ret = rdev->ops->start_nan(&rdev->wiphy, wdev, conf);
+       trace_rdev_return_int(&rdev->wiphy, ret);
+       return ret;
+}
+
+static inline void rdev_stop_nan(struct cfg80211_registered_device *rdev,
+                                struct wireless_dev *wdev)
+{
+       trace_rdev_stop_nan(&rdev->wiphy, wdev);
+       rdev->ops->stop_nan(&rdev->wiphy, wdev);
+       trace_rdev_return_void(&rdev->wiphy);
+}
+
+static inline int
+rdev_add_nan_func(struct cfg80211_registered_device *rdev,
+                 struct wireless_dev *wdev,
+                 struct cfg80211_nan_func *nan_func)
+{
+       int ret;
+
+       trace_rdev_add_nan_func(&rdev->wiphy, wdev, nan_func);
+       ret = rdev->ops->add_nan_func(&rdev->wiphy, wdev, nan_func);
+       trace_rdev_return_int(&rdev->wiphy, ret);
+       return ret;
+}
+
+static inline void rdev_del_nan_func(struct cfg80211_registered_device *rdev,
+                                   struct wireless_dev *wdev, u64 cookie)
+{
+       trace_rdev_del_nan_func(&rdev->wiphy, wdev, cookie);
+       rdev->ops->del_nan_func(&rdev->wiphy, wdev, cookie);
+       trace_rdev_return_void(&rdev->wiphy);
+}
+
+static inline int
+rdev_nan_change_conf(struct cfg80211_registered_device *rdev,
+                    struct wireless_dev *wdev,
+                    struct cfg80211_nan_conf *conf, u32 changes)
+{
+       int ret;
+
+       trace_rdev_nan_change_conf(&rdev->wiphy, wdev, conf, changes);
+       if (rdev->ops->nan_change_conf)
+               ret = rdev->ops->nan_change_conf(&rdev->wiphy, wdev, conf,
+                                                changes);
+       else
+               ret = -ENOTSUPP;
+       trace_rdev_return_int(&rdev->wiphy, ret);
+       return ret;
+}
+
 static inline int rdev_set_mac_acl(struct cfg80211_registered_device *rdev,
                                   struct net_device *dev,
                                   struct cfg80211_acl_data *params)