wifi: cfg80211: Add link_id parameter to various key operations for MLO

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

diff --git a/net/wireless/rdev-ops.h b/net/wireless/rdev-ops.h
index 40915a82da739011fabf4bd00213e7c8b6ceaf3f..13b209a8db2879aaf2ee0d8400246e3a1ea3d1db 100644 (file)
--- a/net/wireless/rdev-ops.h
+++ b/net/wireless/rdev-ops.h
@@ -77,65 +77,69 @@ rdev_change_virtual_intf(struct cfg80211_registered_device *rdev,
 }
 
 static inline int rdev_add_key(struct cfg80211_registered_device *rdev,
-                              struct net_device *netdev, u8 key_index,
-                              bool pairwise, const u8 *mac_addr,
+                              struct net_device *netdev, int link_id,
+                              u8 key_index, bool pairwise, const u8 *mac_addr,
                               struct key_params *params)
 {
        int ret;
-       trace_rdev_add_key(&rdev->wiphy, netdev, key_index, pairwise,
+       trace_rdev_add_key(&rdev->wiphy, netdev, link_id, key_index, pairwise,
                           mac_addr, params->mode);
-       ret = rdev->ops->add_key(&rdev->wiphy, netdev, key_index, pairwise,
-                                 mac_addr, params);
+       ret = rdev->ops->add_key(&rdev->wiphy, netdev, link_id, key_index,
+                                 pairwise, mac_addr, params);
        trace_rdev_return_int(&rdev->wiphy, ret);
        return ret;
 }
 
 static inline int
 rdev_get_key(struct cfg80211_registered_device *rdev, struct net_device *netdev,
-            u8 key_index, bool pairwise, const u8 *mac_addr, void *cookie,
+            int link_id, u8 key_index, bool pairwise, const u8 *mac_addr,
+            void *cookie,
             void (*callback)(void *cookie, struct key_params*))
 {
        int ret;
-       trace_rdev_get_key(&rdev->wiphy, netdev, key_index, pairwise, mac_addr);
-       ret = rdev->ops->get_key(&rdev->wiphy, netdev, key_index, pairwise,
-                                 mac_addr, cookie, callback);
+       trace_rdev_get_key(&rdev->wiphy, netdev, link_id, key_index, pairwise,
+                          mac_addr);
+       ret = rdev->ops->get_key(&rdev->wiphy, netdev, link_id, key_index,
+                                 pairwise, mac_addr, cookie, callback);
        trace_rdev_return_int(&rdev->wiphy, ret);
        return ret;
 }
 
 static inline int rdev_del_key(struct cfg80211_registered_device *rdev,
-                              struct net_device *netdev, u8 key_index,
-                              bool pairwise, const u8 *mac_addr)
+                              struct net_device *netdev, int link_id,
+                              u8 key_index, bool pairwise, const u8 *mac_addr)
 {
        int ret;
-       trace_rdev_del_key(&rdev->wiphy, netdev, key_index, pairwise, mac_addr);
-       ret = rdev->ops->del_key(&rdev->wiphy, netdev, key_index, pairwise,
-                                 mac_addr);
+       trace_rdev_del_key(&rdev->wiphy, netdev, link_id, key_index, pairwise,
+                          mac_addr);
+       ret = rdev->ops->del_key(&rdev->wiphy, netdev, link_id, key_index,
+                                 pairwise, mac_addr);
        trace_rdev_return_int(&rdev->wiphy, ret);
        return ret;
 }
 
 static inline int
 rdev_set_default_key(struct cfg80211_registered_device *rdev,
-                    struct net_device *netdev, u8 key_index, bool unicast,
-                    bool multicast)
+                    struct net_device *netdev, int link_id, u8 key_index,
+                    bool unicast, bool multicast)
 {
        int ret;
-       trace_rdev_set_default_key(&rdev->wiphy, netdev, key_index,
+       trace_rdev_set_default_key(&rdev->wiphy, netdev, link_id, key_index,
                                   unicast, multicast);
-       ret = rdev->ops->set_default_key(&rdev->wiphy, netdev, key_index,
-                                         unicast, multicast);
+       ret = rdev->ops->set_default_key(&rdev->wiphy, netdev, link_id,
+                                         key_index, unicast, multicast);
        trace_rdev_return_int(&rdev->wiphy, ret);
        return ret;
 }
 
 static inline int
 rdev_set_default_mgmt_key(struct cfg80211_registered_device *rdev,
-                         struct net_device *netdev, u8 key_index)
+                         struct net_device *netdev, int link_id, u8 key_index)
 {
        int ret;
-       trace_rdev_set_default_mgmt_key(&rdev->wiphy, netdev, key_index);
-       ret = rdev->ops->set_default_mgmt_key(&rdev->wiphy, netdev,
+       trace_rdev_set_default_mgmt_key(&rdev->wiphy, netdev, link_id,
+                                       key_index);
+       ret = rdev->ops->set_default_mgmt_key(&rdev->wiphy, netdev, link_id,
                                               key_index);
        trace_rdev_return_int(&rdev->wiphy, ret);
        return ret;
@@ -143,13 +147,15 @@ rdev_set_default_mgmt_key(struct cfg80211_registered_device *rdev,
 
 static inline int
 rdev_set_default_beacon_key(struct cfg80211_registered_device *rdev,
-                           struct net_device *netdev, u8 key_index)
+                           struct net_device *netdev, int link_id,
+                           u8 key_index)
 {
        int ret;
 
-       trace_rdev_set_default_beacon_key(&rdev->wiphy, netdev, key_index);
-       ret = rdev->ops->set_default_beacon_key(&rdev->wiphy, netdev,
-                                               key_index);
+       trace_rdev_set_default_beacon_key(&rdev->wiphy, netdev, link_id,
+                                         key_index);
+       ret = rdev->ops->set_default_beacon_key(&rdev->wiphy, netdev, link_id,
+                                                key_index);
        trace_rdev_return_int(&rdev->wiphy, ret);
        return ret;
 }