qcacld-3.0: Introduce support to add vlan group key

In api wlan_hdd_add_key_vdev(), for multipass
sap usecase data traffic is dropped during
transition between multiple password due to
group key mismatch for VLAN.

Introduce support to maintain vlan_id_map
in order to facilate the management of group
key for multipass SAP.

Change-Id: I196a02dad2b979bae10d179e15c3187420bbd19f
CRs-Fixed: 3539185

core/hdd/src/wlan_hdd_cfg80211.c

@@ -86,6 +86,8 @@
 #include "wlan_hdd_ocb.h"
 #include "wlan_hdd_tsf.h"
 
+#include "sap_internal.h"
+
 #include "wlan_hdd_green_ap.h"
 
 #include "wlan_hdd_subnet_detect.h"
@@ -22197,11 +22199,59 @@ wlan_hdd_set_vlan_groupkey(ol_txrx_soc_handle soc_txrx_handle, uint16_t vdev_id,
 		cdp_set_vlan_groupkey(soc_txrx_handle, vdev_id,
 				      params->vlan_id, key_index);
 }
+
+static int
+wlan_hdd_add_vlan(struct wlan_objmgr_vdev *vdev, struct sap_context *sap_ctx,
+		  struct key_params *params, uint8_t key_index,
+		  uint8_t *vlan_key_idx)
+{
+	struct wlan_objmgr_psoc *psoc = NULL;
+	ol_txrx_soc_handle soc_txrx_handle;
+	uint16_t *vlan_map = sap_ctx->vlan_map;
+	uint8_t found = 0;
+	int i = 0;
+
+	psoc = wlan_vdev_get_psoc(vdev);
+	if (!psoc) {
+		hdd_err("Unable to get psoc");
+		return -EINVAL;
+	}
+
+	for (i = 0; i < (2 * MAX_VLAN); i += 2) {
+		if (!vlan_map[i] || !vlan_map[i + 1]) {
+			found = 1;
+			break;
+		} else if ((vlan_map[i] == params->vlan_id) ||
+			   (vlan_map[i + 1] == params->vlan_id)) {
+			vlan_map[i] = 0;
+			vlan_map[i + 1] = 0;
+			found = 1;
+			break;
+		}
+	}
+
+	if (found) {
+		soc_txrx_handle = wlan_psoc_get_dp_handle(psoc);
+		vlan_map[i + key_index - 1] = params->vlan_id;
+		wlan_hdd_set_vlan_groupkey(soc_txrx_handle,
+					   wlan_vdev_get_id(vdev),
+					   params,
+					   (i / 2) + 1);
+		*vlan_key_idx = (i + key_index - 1 + 8);
+		return 0;
+	}
+
+	hdd_err("Unable to find group key mapping for vlan_id: %d",
+		params->vlan_id);
+	return -EINVAL;
+}
 #else
-static void
-wlan_hdd_set_vlan_groupkey(ol_txrx_soc_handle soc_txrx_handle, uint16_t vdev_id,
-			   struct key_params *params, uint8_t key_index)
+static int
+wlan_hdd_add_vlan(struct wlan_objmgr_vdev *vdev, struct sap_context *sap_ctx,
+		  struct key_params *params, uint8_t key_index,
+		  uint8_t *vlan_key_idx)
 {
+	return key_index;
 }
 #endif
 
@@ -22219,8 +22269,9 @@ static int wlan_hdd_add_key_vdev(mac_handle_t mac_handle,
 	int errno;
 	enum wlan_crypto_cipher_type cipher;
 	bool ft_mode = false;
+	uint8_t keyidx;
 	struct hdd_ap_ctx *hdd_ap_ctx;
-	ol_txrx_soc_handle soc_txrx_handle;
+	struct sap_context *sap_ctx;
 
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 
@@ -22312,19 +22363,21 @@ done:
 			hdd_err("don't need install key during auth");
 			return -EINVAL;
 		}
-		errno = wlan_hdd_add_key_sap(adapter, pairwise,
-					     key_index, cipher);
 
-		if (!pairwise) {
-			if (ucfg_mlme_is_multipass_sap(hdd_ctx->psoc)) {
-				soc_txrx_handle =
-					wlan_psoc_get_dp_handle(hdd_ctx->psoc);
-				 wlan_hdd_set_vlan_groupkey(soc_txrx_handle,
-							    wlan_vdev_get_id(vdev),
-							    params, key_index);
-			}
+		keyidx = key_index;
+
+		if (ucfg_mlme_is_multipass_sap(hdd_ctx->psoc) &&
+		    params->vlan_id) {
+			sap_ctx = hdd_ap_ctx->sap_context;
+			errno = wlan_hdd_add_vlan(vdev, sap_ctx, params,
+						  key_index, &keyidx);
+			if (errno < 0)
+				return errno;
 		}
 
+		errno = wlan_hdd_add_key_sap(adapter, pairwise,
+					     keyidx, cipher);
+
 		break;
 	case QDF_STA_MODE:
 	case QDF_P2P_CLIENT_MODE:

core/sap/src/sap_internal.h

@@ -121,6 +121,7 @@ struct sap_avoid_channels_info {
 };
 #endif /* FEATURE_AP_MCC_CH_AVOIDANCE */
 
+#define MAX_VLAN 4
 struct sap_context {
 
 	/* Include the current channel frequency of AP */
@@ -254,6 +255,9 @@ struct sap_context {
  */
 	bool clean_channel_array[NUM_CHANNELS];
 #endif
+#ifdef QCA_MULTIPASS_SUPPORT
+	uint16_t vlan_map[MAX_VLAN];
+#endif
 };
 
 /*----------------------------------------------------------------------------