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

[linux-block.git] / drivers / net / wireless / marvell / mwifiex / cfg80211.c

diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
index 134114ac1ac00ab9acf86e1e617f3c909df367c6..535995e8279f4ad2e82bbcb72a59d6a86d689dca 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
@@ -142,7 +142,8 @@ static void *mwifiex_cfg80211_get_adapter(struct wiphy *wiphy)
  */
 static int
 mwifiex_cfg80211_del_key(struct wiphy *wiphy, struct net_device *netdev,
-                        u8 key_index, bool pairwise, const u8 *mac_addr)
+                        int link_id, u8 key_index, bool pairwise,
+                        const u8 *mac_addr)
 {
        struct mwifiex_private *priv = mwifiex_netdev_get_priv(netdev);
        static const u8 bc_mac[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
@@ -431,7 +432,7 @@ mwifiex_cfg80211_set_power_mgmt(struct wiphy *wiphy,
  */
 static int
 mwifiex_cfg80211_set_default_key(struct wiphy *wiphy, struct net_device *netdev,
-                                u8 key_index, bool unicast,
+                                int link_id, u8 key_index, bool unicast,
                                 bool multicast)
 {
        struct mwifiex_private *priv = mwifiex_netdev_get_priv(netdev);
@@ -456,8 +457,8 @@ mwifiex_cfg80211_set_default_key(struct wiphy *wiphy, struct net_device *netdev,
  */
 static int
 mwifiex_cfg80211_add_key(struct wiphy *wiphy, struct net_device *netdev,
-                        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)
 {
        struct mwifiex_private *priv = mwifiex_netdev_get_priv(netdev);
        struct mwifiex_wep_key *wep_key;
@@ -494,6 +495,7 @@ mwifiex_cfg80211_add_key(struct wiphy *wiphy, struct net_device *netdev,
 static int
 mwifiex_cfg80211_set_default_mgmt_key(struct wiphy *wiphy,
                                      struct net_device *netdev,
+                                     int link_id,
                                      u8 key_index)
 {
        struct mwifiex_private *priv = mwifiex_netdev_get_priv(netdev);