Merge tag 'wireless-next-2022-08-26-v2' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-block.git] / drivers / staging / rtl8723bs / os_dep / ioctl_cfg80211.c

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index cb6d287f580dc24e39beef7a8626bf36acdf152b..2d09be6425d5b3ea82927c9c899484a78ecf4d84 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -850,8 +850,8 @@ exit:
 }
 
 static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev,
-                               u8 key_index, bool pairwise, const u8 *mac_addr,
-                               struct key_params *params)
+                               int link_id, u8 key_index, bool pairwise,
+                               const u8 *mac_addr, struct key_params *params)
 {
        char *alg_name;
        u32 param_len;
@@ -932,8 +932,8 @@ addkey_end:
 }
 
 static int cfg80211_rtw_get_key(struct wiphy *wiphy, struct net_device *ndev,
-                               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*))
 {
@@ -941,7 +941,8 @@ static int cfg80211_rtw_get_key(struct wiphy *wiphy, struct net_device *ndev,
 }
 
 static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev,
-                               u8 key_index, bool pairwise, const u8 *mac_addr)
+                               int link_id, u8 key_index, bool pairwise,
+                               const u8 *mac_addr)
 {
        struct adapter *padapter = rtw_netdev_priv(ndev);
        struct security_priv *psecuritypriv = &padapter->securitypriv;
@@ -955,7 +956,7 @@ static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev,
 }
 
 static int cfg80211_rtw_set_default_key(struct wiphy *wiphy,
-       struct net_device *ndev, u8 key_index
+       struct net_device *ndev, int link_id, u8 key_index
        , bool unicast, bool multicast
        )
 {