Browse Source

qcacld-3.0: Rename HDD variable peerMacAddr

The Linux Coding Style frowns upon mixed-case names so rename HDD
local variable peerMacAddr to be compliant.

Change-Id: I0f3cf3bd7b2a7a5d0da2c374ce1e2bdb0d7cac09
CRs-Fixed: 2408056
Jeff Johnson 6 years ago
parent
commit
2d04461839

+ 6 - 6
core/hdd/src/wlan_hdd_assoc.c

@@ -1340,7 +1340,7 @@ static void hdd_send_association_event(struct net_device *dev,
 	union iwreq_data wrqu;
 	int we_event;
 	char *msg;
-	struct qdf_mac_addr peerMacAddr;
+	struct qdf_mac_addr peer_macaddr;
 	struct csr_roam_profile *roam_profile;
 
 	roam_profile = hdd_roam_profile(adapter);
@@ -1404,7 +1404,7 @@ static void hdd_send_association_event(struct net_device *dev,
 		    ) {
 			hdd_send_ft_assoc_response(dev, adapter, pCsrRoamInfo);
 		}
-		qdf_copy_macaddr(&peerMacAddr,
+		qdf_copy_macaddr(&peer_macaddr,
 				 &sta_ctx->conn_info.bssId);
 		chan_info.chan_id = pCsrRoamInfo->chan_info.chan_id;
 		chan_info.mhz = pCsrRoamInfo->chan_info.mhz;
@@ -1422,10 +1422,10 @@ static void hdd_send_association_event(struct net_device *dev,
 						     WLAN_ASSOC_STATE);
 		if (ret)
 			hdd_err("Peer object %pM fail to set associated state",
-					peerMacAddr.bytes);
+					peer_macaddr.bytes);
 
 		/* send peer status indication to oem app */
-		hdd_send_peer_status_ind_to_app(&peerMacAddr,
+		hdd_send_peer_status_ind_to_app(&peer_macaddr,
 						ePeerConnected,
 						pCsrRoamInfo->timingMeasCap,
 						adapter->vdev_id, &chan_info,
@@ -1473,11 +1473,11 @@ static void hdd_send_association_event(struct net_device *dev,
 
 		if ((adapter->device_mode == QDF_STA_MODE) ||
 		    (adapter->device_mode == QDF_P2P_CLIENT_MODE)) {
-			qdf_copy_macaddr(&peerMacAddr,
+			qdf_copy_macaddr(&peer_macaddr,
 					 &sta_ctx->conn_info.bssId);
 
 			/* send peer status indication to oem app */
-			hdd_send_peer_status_ind_to_app(&peerMacAddr,
+			hdd_send_peer_status_ind_to_app(&peer_macaddr,
 							ePeerDisconnected, 0,
 							adapter->vdev_id,
 							NULL,

+ 7 - 7
core/hdd/src/wlan_hdd_hostapd_wext.c

@@ -1924,7 +1924,7 @@ static __iw_softap_disassoc_sta(struct net_device *dev,
 {
 	struct hdd_adapter *adapter = (netdev_priv(dev));
 	struct hdd_context *hdd_ctx;
-	uint8_t *peerMacAddr;
+	uint8_t *peer_macaddr;
 	int ret;
 	struct csr_del_sta_params del_sta_params;
 
@@ -1947,14 +1947,14 @@ static __iw_softap_disassoc_sta(struct net_device *dev,
 	/* iwpriv tool or framework calls this ioctl with
 	 * data passed in extra (less than 16 octets);
 	 */
-	peerMacAddr = (uint8_t *) (extra);
+	peer_macaddr = (uint8_t *) (extra);
 
 	hdd_debug("data " MAC_ADDRESS_STR,
-	       MAC_ADDR_ARRAY(peerMacAddr));
-	wlansap_populate_del_sta_params(peerMacAddr,
-			eSIR_MAC_DEAUTH_LEAVING_BSS_REASON,
-			(SIR_MAC_MGMT_DISASSOC >> 4),
-			&del_sta_params);
+		  MAC_ADDR_ARRAY(peer_macaddr));
+	wlansap_populate_del_sta_params(peer_macaddr,
+					eSIR_MAC_DEAUTH_LEAVING_BSS_REASON,
+					(SIR_MAC_MGMT_DISASSOC >> 4),
+					&del_sta_params);
 	hdd_softap_sta_disassoc(adapter, &del_sta_params);
 
 	hdd_exit();

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

@@ -5243,7 +5243,7 @@ static int drv_cmd_get_ibss_peer_info(struct hdd_adapter *adapter,
 	char extra[128] = { 0 };
 	uint32_t length = 0;
 	uint8_t staIdx = 0;
-	struct qdf_mac_addr peerMacAddr;
+	struct qdf_mac_addr peer_macaddr;
 
 	if (QDF_IBSS_MODE != adapter->device_mode) {
 		hdd_warn("Unsupported in mode %s(%d)",
@@ -5265,7 +5265,7 @@ static int drv_cmd_get_ibss_peer_info(struct hdd_adapter *adapter,
 	}
 
 	/* Parse the incoming command buffer */
-	status = hdd_parse_get_ibss_peer_info(value, &peerMacAddr);
+	status = hdd_parse_get_ibss_peer_info(value, &peer_macaddr);
 	if (QDF_STATUS_SUCCESS != status) {
 		hdd_err("Invalid GETIBSSPEERINFO command");
 		ret = -EINVAL;
@@ -5273,7 +5273,7 @@ static int drv_cmd_get_ibss_peer_info(struct hdd_adapter *adapter,
 	}
 
 	/* Get station index for the peer mac address and sanitize it */
-	hdd_get_peer_sta_id(sta_ctx, &peerMacAddr, &staIdx);
+	hdd_get_peer_sta_id(sta_ctx, &peer_macaddr, &staIdx);
 
 	if (staIdx > MAX_PEERS) {
 		hdd_err("Invalid StaIdx %d returned", staIdx);

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

@@ -5748,7 +5748,7 @@ QDF_STATUS hdd_reset_all_adapters(struct hdd_context *hdd_ctx)
 {
 	struct hdd_adapter *adapter;
 	struct hdd_station_ctx *sta_ctx;
-	struct qdf_mac_addr peerMacAddr;
+	struct qdf_mac_addr peer_macaddr;
 	int sta_id;
 	bool value;
 	struct wlan_objmgr_vdev *vdev;
@@ -5841,7 +5841,7 @@ QDF_STATUS hdd_reset_all_adapters(struct hdd_context *hdd_ctx)
 		if (adapter->device_mode == QDF_STA_MODE ||
 		    adapter->device_mode == QDF_P2P_CLIENT_MODE) {
 			sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
-			qdf_copy_macaddr(&peerMacAddr,
+			qdf_copy_macaddr(&peer_macaddr,
 					 &sta_ctx->conn_info.bssId);
 
 		} else if (adapter->device_mode == QDF_P2P_GO_MODE) {