Parcourir la source

qcacld-3.0: Rename hdd_ap_ctx groupKey field

Per the Linux coding style "mixed-case names are frowned upon" so
rename field groupKey in struct hdd_ap_ctx.

Change-Id: I3dcac71706cee8c97593370e7c3d0c99d56dca20
CRs-Fixed: 2134926
Jeff Johnson il y a 7 ans
Parent
commit
413c15f9f9

+ 2 - 5
core/hdd/inc/wlan_hdd_main.h

@@ -813,6 +813,7 @@ struct hdd_station_info {
  * @broadcast_sta_id: Station ID assigned after BSS starts
  * @privacy: The privacy bits of configuration
  * @encryption_type: The encryption being used
+ * @group_key: Group Encryption Key
  */
 struct hdd_ap_ctx {
 	struct hdd_hostapd_state hostapd_state;
@@ -820,6 +821,7 @@ struct hdd_ap_ctx {
 	uint8_t broadcast_sta_id;
 	uint8_t privacy;
 	eCsrEncryptionType encryption_type;
+	tCsrRoamSetKey group_key;
 
 	tSirWPSPBCProbeReq WPSPBCProbeReq;
 
@@ -831,11 +833,6 @@ struct hdd_ap_ctx {
 
 	uint8_t operatingChannel;
 
-
-	/* This will point to group key data,
-	 * if it is received before start bss
-	 */
-	tCsrRoamSetKey groupKey;
 	/* This will have WEP key data, if it is received before start bss */
 	tCsrRoamSetKey wepKey[CSR_MAX_NUM_KEY];
 

+ 2 - 2
core/hdd/src/wlan_hdd_cfg80211.c

@@ -14409,14 +14409,14 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy,
 			}
 		}
 
-		/* Save the key in ap ctx for use on START_BASS and restart */
+		/* Save the key in ap ctx for use on START_BSS and restart */
 		if (pairwise ||
 			eCSR_ENCRYPT_TYPE_WEP40_STATICKEY == setKey.encType ||
 			eCSR_ENCRYPT_TYPE_WEP104_STATICKEY == setKey.encType)
 			qdf_mem_copy(&ap_ctx->wepKey[key_index], &setKey,
 				     sizeof(tCsrRoamSetKey));
 		else
-			qdf_mem_copy(&ap_ctx->groupKey, &setKey,
+			qdf_mem_copy(&ap_ctx->group_key, &setKey,
 				     sizeof(tCsrRoamSetKey));
 
 	} else if ((adapter->device_mode == QDF_STA_MODE) ||

+ 3 - 3
core/hdd/src/wlan_hdd_hostapd.c

@@ -1589,10 +1589,10 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 			ap_ctx->wep_def_key_idx);
 
 		/* Set group key / WEP key every time when BSS is restarted */
-		if (ap_ctx->groupKey.keyLength) {
+		if (ap_ctx->group_key.keyLength) {
 			status = wlansap_set_key_sta(
 				WLAN_HDD_GET_SAP_CTX_PTR(adapter),
-				&ap_ctx->groupKey);
+				&ap_ctx->group_key);
 			if (!QDF_IS_STATUS_SUCCESS(status))
 				hdd_err("wlansap_set_key_sta failed");
 		} else {
@@ -1703,7 +1703,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 			 * should not be cleared due to hostapd will not
 			 * repopulate the original keys
 			 */
-			ap_ctx->groupKey.keyLength = 0;
+			ap_ctx->group_key.keyLength = 0;
 			for (i = 0; i < CSR_MAX_NUM_KEY; i++)
 				ap_ctx->wepKey[i].keyLength = 0;
 		}