Commit e7a7b84e authored by Veerendranath Jakkam's avatar Veerendranath Jakkam Committed by Johannes Berg
Browse files

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



Add support for various key operations on MLD by adding new parameter
link_id. Pass the link_id received from userspace to driver for add_key,
get_key, del_key, set_default_key, set_default_mgmt_key and
set_default_beacon_key to support configuring keys specific to each MLO
link. Userspace must not specify link ID for MLO pairwise key since it
is common for all the MLO links.

Signed-off-by: default avatarVeerendranath Jakkam <quic_vjakkam@quicinc.com>
Link: https://lore.kernel.org/r/20220730052643.1959111-4-quic_vjakkam@quicinc.com


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent aa129bcd

drivers/net/wireless/ath/ath6kl/cfg80211.c

+4 −4
Original line number Diff line number Diff line
@@ -1124,7 +1124,7 @@ void ath6kl_cfg80211_ch_switch_notify(struct ath6kl_vif *vif, int freq, 
}



static int ath6kl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,

				   u8 key_index, bool pairwise,

				   int link_id, u8 key_index, bool pairwise,

				   const u8 *mac_addr,

				   struct key_params *params)

{
@@ -1249,7 +1249,7 @@ static int ath6kl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev, 
}



static int ath6kl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev,

				   u8 key_index, bool pairwise,

				   int link_id, u8 key_index, bool pairwise,

				   const u8 *mac_addr)

{

	struct ath6kl *ar = ath6kl_priv(ndev);
@@ -1279,7 +1279,7 @@ static int ath6kl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev, 
}



static int ath6kl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev,

				   u8 key_index, bool pairwise,

				   int link_id, u8 key_index, bool pairwise,

				   const u8 *mac_addr, void *cookie,

				   void (*callback) (void *cookie,

						     struct key_params *))
@@ -1314,7 +1314,7 @@ static int ath6kl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev, 
}



static int ath6kl_cfg80211_set_default_key(struct wiphy *wiphy,

					   struct net_device *ndev,

					   struct net_device *ndev, int link_id,

					   u8 key_index, bool unicast,

					   bool multicast)

{

drivers/net/wireless/ath/wil6210/cfg80211.c

+5 −5
Original line number Diff line number Diff line
@@ -1620,7 +1620,7 @@ static void wil_del_rx_key(u8 key_index, enum wmi_key_usage key_usage, 
}



static int wil_cfg80211_add_key(struct wiphy *wiphy,

				struct net_device *ndev,

				struct net_device *ndev, int link_id,

				u8 key_index, bool pairwise,

				const u8 *mac_addr,

				struct key_params *params)
@@ -1696,7 +1696,7 @@ static int wil_cfg80211_add_key(struct wiphy *wiphy, 
}



static int wil_cfg80211_del_key(struct wiphy *wiphy,

				struct net_device *ndev,

				struct net_device *ndev, int link_id,

				u8 key_index, bool pairwise,

				const u8 *mac_addr)

{
@@ -1723,7 +1723,7 @@ static int wil_cfg80211_del_key(struct wiphy *wiphy, 


/* Need to be present or wiphy_new() will WARN */

static int wil_cfg80211_set_default_key(struct wiphy *wiphy,

					struct net_device *ndev,

					struct net_device *ndev, int link_id,

					u8 key_index, bool unicast,

					bool multicast)

{
@@ -2072,8 +2072,8 @@ void wil_cfg80211_ap_recovery(struct wil6210_priv *wil) 
		key_params.key = vif->gtk;

		key_params.key_len = vif->gtk_len;

		key_params.seq_len = IEEE80211_GCMP_PN_LEN;

		rc = wil_cfg80211_add_key(wiphy, ndev, vif->gtk_index, false,

					  NULL, &key_params);

		rc = wil_cfg80211_add_key(wiphy, ndev, -1, vif->gtk_index,

					  false, NULL, &key_params);

		if (rc)

			wil_err(wil, "vif %d recovery add key failed (%d)\n",

				i, rc);

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c

+13 −9
Original line number Diff line number Diff line
@@ -2361,7 +2361,8 @@ brcmf_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, 


static s32

brcmf_cfg80211_config_default_key(struct wiphy *wiphy, struct net_device *ndev,

				  u8 key_idx, bool unicast, bool multicast)

				  int link_id, u8 key_idx, bool unicast,

				  bool multicast)

{

	struct brcmf_if *ifp = netdev_priv(ndev);

	struct brcmf_pub *drvr = ifp->drvr;
@@ -2395,7 +2396,8 @@ brcmf_cfg80211_config_default_key(struct wiphy *wiphy, struct net_device *ndev, 


static s32

brcmf_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev,

		       u8 key_idx, bool pairwise, const u8 *mac_addr)

		       int link_id, u8 key_idx, bool pairwise,

		       const u8 *mac_addr)

{

	struct brcmf_if *ifp = netdev_priv(ndev);

	struct brcmf_wsec_key *key;
@@ -2432,8 +2434,8 @@ brcmf_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev, 


static s32

brcmf_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,

		       u8 key_idx, bool pairwise, const u8 *mac_addr,

		       struct key_params *params)

		       int link_id, u8 key_idx, bool pairwise,

		       const u8 *mac_addr, struct key_params *params)

{

	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);

	struct brcmf_if *ifp = netdev_priv(ndev);
@@ -2457,8 +2459,8 @@ brcmf_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev, 
	}



	if (params->key_len == 0)

		return brcmf_cfg80211_del_key(wiphy, ndev, key_idx, pairwise,

					      mac_addr);

		return brcmf_cfg80211_del_key(wiphy, ndev, -1, key_idx,

					      pairwise, mac_addr);



	if (params->key_len > sizeof(key->data)) {

		bphy_err(drvr, "Too long key length (%u)\n", params->key_len);
@@ -2553,8 +2555,9 @@ brcmf_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev, 
}



static s32

brcmf_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev, u8 key_idx,

		       bool pairwise, const u8 *mac_addr, void *cookie,

brcmf_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev,

		       int link_id, u8 key_idx, bool pairwise,

		       const u8 *mac_addr, void *cookie,

		       void (*callback)(void *cookie,

					struct key_params *params))

{
@@ -2610,7 +2613,8 @@ brcmf_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev, u8 key_idx, 


static s32

brcmf_cfg80211_config_default_mgmt_key(struct wiphy *wiphy,

				       struct net_device *ndev, u8 key_idx)

				       struct net_device *ndev, int link_id,

				       u8 key_idx)

{

	struct brcmf_if *ifp = netdev_priv(ndev);

drivers/net/wireless/marvell/libertas/cfg.c

+5 −4
Original line number Diff line number Diff line
@@ -1435,7 +1435,7 @@ static int lbs_cfg_disconnect(struct wiphy *wiphy, struct net_device *dev, 
}



static int lbs_cfg_set_default_key(struct wiphy *wiphy,

				   struct net_device *netdev,

				   struct net_device *netdev, int link_id,

				   u8 key_index, bool unicast,

				   bool multicast)

{
@@ -1455,8 +1455,8 @@ static int lbs_cfg_set_default_key(struct wiphy *wiphy, 




static int lbs_cfg_add_key(struct wiphy *wiphy, struct net_device *netdev,

			   u8 idx, bool pairwise, const u8 *mac_addr,

			   struct key_params *params)

			   int link_id, u8 idx, bool pairwise,

			   const u8 *mac_addr, struct key_params *params)

{

	struct lbs_private *priv = wiphy_priv(wiphy);

	u16 key_info;
@@ -1516,7 +1516,8 @@ static int lbs_cfg_add_key(struct wiphy *wiphy, struct net_device *netdev, 




static int lbs_cfg_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)

{



	lbs_deb_assoc("del_key: key_idx %d, mac_addr %pM\n",

drivers/net/wireless/marvell/mwifiex/cfg80211.c

+6 −4
Original line number Diff line number Diff line
@@ -154,7 +154,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};
@@ -443,7 +444,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);
@@ -468,8 +469,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;
@@ -506,6 +507,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);