Kaynağa Gözat

qcacld-3.0: Rename p2pDeviceAddress

Per the Linux coding style "mixed-case names are frowned upon" so
rename field p2pDeviceAddress in struct hdd_context as well as the
local variable of the same name in __wlan_hdd_add_virtual_intf().

Change-Id: I5604066e115630786afe381ee61433ed516e3248
CRs-Fixed: 2138013
Jeff Johnson 7 yıl önce
ebeveyn
işleme
acbdb1c174

+ 1 - 1
core/hdd/inc/wlan_hdd_main.h

@@ -1504,7 +1504,7 @@ struct hdd_context {
 	uint8_t no_of_active_sessions[QDF_MAX_NO_OF_MODE];
 
 	/** P2P Device MAC Address for the adapter  */
-	struct qdf_mac_addr p2pDeviceAddress;
+	struct qdf_mac_addr p2p_device_address;
 
 	qdf_wake_lock_t rx_wake_lock;
 	qdf_wake_lock_t sap_wake_lock;

+ 5 - 5
core/hdd/src/wlan_hdd_ioctl.c

@@ -2847,14 +2847,14 @@ static int drv_cmd_p2p_dev_addr(struct hdd_adapter *adapter,
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_P2P_DEV_ADDR_IOCTL,
 			 adapter->session_id,
-			(unsigned int)(*(hdd_ctx->p2pDeviceAddress.bytes + 2)
-				<< 24 | *(hdd_ctx->p2pDeviceAddress.bytes
+			(unsigned int)(*(hdd_ctx->p2p_device_address.bytes + 2)
+				<< 24 | *(hdd_ctx->p2p_device_address.bytes
 				+ 3) << 16 | *(hdd_ctx->
-				p2pDeviceAddress.bytes + 4) << 8 |
-				*(hdd_ctx->p2pDeviceAddress.bytes +
+				p2p_device_address.bytes + 4) << 8 |
+				*(hdd_ctx->p2p_device_address.bytes +
 				5))));
 
-	if (copy_to_user(priv_data->buf, hdd_ctx->p2pDeviceAddress.bytes,
+	if (copy_to_user(priv_data->buf, hdd_ctx->p2p_device_address.bytes,
 			 sizeof(tSirMacAddr))) {
 		hdd_err("failed to copy data to user buffer");
 		ret = -EFAULT;

+ 5 - 5
core/hdd/src/wlan_hdd_main.c

@@ -7896,7 +7896,7 @@ static int hdd_open_p2p_interface(struct hdd_context *hdd_ctx, bool rtnl_held)
 
 	if (hdd_ctx->config->isP2pDeviceAddrAdministrated &&
 	    !(hdd_ctx->config->intfMacAddr[0].bytes[0] & 0x02)) {
-		qdf_mem_copy(hdd_ctx->p2pDeviceAddress.bytes,
+		qdf_mem_copy(hdd_ctx->p2p_device_address.bytes,
 			     hdd_ctx->config->intfMacAddr[0].bytes,
 			     sizeof(tSirMacAddr));
 
@@ -7905,7 +7905,7 @@ static int hdd_open_p2p_interface(struct hdd_context *hdd_ctx, bool rtnl_held)
 		 * the device's primary MAC address with the locally
 		 * administered bit set.
 		 */
-		hdd_ctx->p2pDeviceAddress.bytes[0] |= 0x02;
+		hdd_ctx->p2p_device_address.bytes[0] |= 0x02;
 	} else {
 		p2p_dev_addr = wlan_hdd_get_intf_addr(hdd_ctx);
 		if (p2p_dev_addr == NULL) {
@@ -7913,12 +7913,12 @@ static int hdd_open_p2p_interface(struct hdd_context *hdd_ctx, bool rtnl_held)
 			return -ENOSPC;
 		}
 
-		qdf_mem_copy(&hdd_ctx->p2pDeviceAddress.bytes[0], p2p_dev_addr,
-			     QDF_MAC_ADDR_SIZE);
+		qdf_mem_copy(&hdd_ctx->p2p_device_address.bytes[0],
+			     p2p_dev_addr, QDF_MAC_ADDR_SIZE);
 	}
 
 	adapter = hdd_open_adapter(hdd_ctx, QDF_P2P_DEVICE_MODE, "p2p%d",
-				   &hdd_ctx->p2pDeviceAddress.bytes[0],
+				   &hdd_ctx->p2p_device_address.bytes[0],
 				   NET_NAME_UNKNOWN, rtnl_held);
 
 	if (NULL == adapter) {

+ 4 - 4
core/hdd/src/wlan_hdd_p2p.c

@@ -613,12 +613,12 @@ struct wireless_dev *__wlan_hdd_add_virtual_intf(struct wiphy *wiphy,
 		 * Generate the P2P Interface Address. this address must be
 		 * different from the P2P Device Address.
 		 */
-		struct qdf_mac_addr p2pDeviceAddress =
-						hdd_ctx->p2pDeviceAddress;
-		p2pDeviceAddress.bytes[4] ^= 0x80;
+		struct qdf_mac_addr p2p_device_address =
+						hdd_ctx->p2p_device_address;
+		p2p_device_address.bytes[4] ^= 0x80;
 		adapter = hdd_open_adapter(hdd_ctx,
 					    session_type,
-					    name, p2pDeviceAddress.bytes,
+					    name, p2p_device_address.bytes,
 					    name_assign_type,
 					    true);
 	} else {