Merge tag 'gpio-fixes-for-v6.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel...

[platform/kernel/linux-rpi.git] / net / wireless / rdev-ops.h

diff --git a/net/wireless/rdev-ops.h b/net/wireless/rdev-ops.h
index 69b5087..90bb7ac 100644 (file)
--- a/net/wireless/rdev-ops.h
+++ b/net/wireless/rdev-ops.h
@@ -407,6 +407,18 @@ static inline int rdev_change_bss(struct cfg80211_registered_device *rdev,
        return ret;
 }
 
+static inline void rdev_inform_bss(struct cfg80211_registered_device *rdev,
+                                  struct cfg80211_bss *bss,
+                                  const struct cfg80211_bss_ies *ies,
+                                  void *drv_data)
+
+{
+       trace_rdev_inform_bss(&rdev->wiphy, bss);
+       if (rdev->ops->inform_bss)
+               rdev->ops->inform_bss(&rdev->wiphy, bss, ies, drv_data);
+       trace_rdev_return_void(&rdev->wiphy);
+}
+
 static inline int rdev_set_txq_params(struct cfg80211_registered_device *rdev,
                                      struct net_device *dev,
                                      struct ieee80211_txq_params *params)
@@ -899,17 +911,18 @@ static inline int rdev_set_rekey_data(struct cfg80211_registered_device *rdev,
 
 static inline int rdev_tdls_mgmt(struct cfg80211_registered_device *rdev,
                                 struct net_device *dev, u8 *peer,
-                                u8 action_code, u8 dialog_token,
-                                u16 status_code, u32 peer_capability,
-                                bool initiator, const u8 *buf, size_t len)
+                                int link_id, u8 action_code,
+                                u8 dialog_token, u16 status_code,
+                                u32 peer_capability, bool initiator,
+                                const u8 *buf, size_t len)
 {
        int ret;
-       trace_rdev_tdls_mgmt(&rdev->wiphy, dev, peer, action_code,
+       trace_rdev_tdls_mgmt(&rdev->wiphy, dev, peer, link_id, action_code,
                             dialog_token, status_code, peer_capability,
                             initiator, buf, len);
-       ret = rdev->ops->tdls_mgmt(&rdev->wiphy, dev, peer, action_code,
-                                  dialog_token, status_code, peer_capability,
-                                  initiator, buf, len);
+       ret = rdev->ops->tdls_mgmt(&rdev->wiphy, dev, peer, link_id,
+                                  action_code, dialog_token, status_code,
+                                  peer_capability, initiator, buf, len);
        trace_rdev_return_int(&rdev->wiphy, ret);
        return ret;
 }