Browse Source

qcacld-3.0: Remove QDF_MAC_ADDR_BROADCAST_INITIALIZER

QDF_MAC_ADDR_BROADCAST_INITIALIZER has been depreciated in favor of
QDF_MAC_ADDR_BCAST_INIT. Replace all usages with the new macro.

Change-Id: Ie5c0816f82169d5e0c831a3166957dc59c1d4ccb
CRs-Fixed: 2176474
Dustin Brown 7 years ago
parent
commit
ce5b3d3331

+ 2 - 4
core/hdd/src/wlan_hdd_assoc.c

@@ -1491,8 +1491,7 @@ QDF_STATUS hdd_roam_deregister_sta(struct hdd_adapter *adapter, uint8_t staid)
 	struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 	int ret = 0;
 	struct qdf_mac_addr *peer_mac = NULL;
-	struct qdf_mac_addr broadcastMacAddr =
-				QDF_MAC_ADDR_BROADCAST_INITIALIZER;
+	struct qdf_mac_addr broadcastMacAddr = QDF_MAC_ADDR_BCAST_INIT;
 	if (eConnectionState_IbssDisconnected ==
 	    sta_ctx->conn_info.connState) {
 		/*
@@ -3300,8 +3299,7 @@ static void hdd_roam_ibss_indication_handler(struct hdd_adapter *adapter,
 	{
 		struct hdd_station_ctx *hdd_sta_ctx =
 			WLAN_HDD_GET_STATION_CTX_PTR(adapter);
-		struct qdf_mac_addr broadcastMacAddr =
-			QDF_MAC_ADDR_BROADCAST_INITIALIZER;
+		struct qdf_mac_addr broadcastMacAddr = QDF_MAC_ADDR_BCAST_INIT;
 		int ret;
 
 		if (NULL == roam_info) {

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

@@ -4494,8 +4494,8 @@ static __iw_softap_set_max_tx_power(struct net_device *dev,
 	int *value = (int *)extra;
 	int set_value;
 	int ret;
-	struct qdf_mac_addr bssid = QDF_MAC_ADDR_BROADCAST_INITIALIZER;
-	struct qdf_mac_addr selfMac = QDF_MAC_ADDR_BROADCAST_INITIALIZER;
+	struct qdf_mac_addr bssid = QDF_MAC_ADDR_BCAST_INIT;
+	struct qdf_mac_addr selfMac = QDF_MAC_ADDR_BCAST_INIT;
 
 	ENTER_DEV(dev);
 
@@ -5472,7 +5472,7 @@ __iw_get_peer_rssi(struct net_device *dev, struct iw_request_info *info,
 	struct hdd_adapter *adapter = netdev_priv(dev);
 	struct hdd_context *hddctx;
 	char macaddrarray[MAC_ADDRESS_STR_LEN];
-	struct qdf_mac_addr macaddress = QDF_MAC_ADDR_BROADCAST_INITIALIZER;
+	struct qdf_mac_addr macaddress = QDF_MAC_ADDR_BCAST_INIT;
 	int ret;
 	char *rssi_info_output = extra;
 	struct sir_peer_sta_info peer_sta_info;

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

@@ -5657,8 +5657,8 @@ static int drv_cmd_max_tx_power(struct hdd_adapter *adapter,
 	int txPower;
 	QDF_STATUS smeStatus;
 	uint8_t *value = command;
-	struct qdf_mac_addr bssid = QDF_MAC_ADDR_BROADCAST_INITIALIZER;
-	struct qdf_mac_addr selfMac = QDF_MAC_ADDR_BROADCAST_INITIALIZER;
+	struct qdf_mac_addr bssid = QDF_MAC_ADDR_BCAST_INIT;
+	struct qdf_mac_addr selfMac = QDF_MAC_ADDR_BCAST_INIT;
 
 	status = hdd_parse_setmaxtxpower_command(value, &txPower);
 	if (status) {

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

@@ -5573,7 +5573,7 @@ QDF_STATUS hdd_start_all_adapters(struct hdd_context *hdd_ctx)
 {
 	struct hdd_adapter *adapter;
 #ifndef MSM_PLATFORM
-	struct qdf_mac_addr bcastMac = QDF_MAC_ADDR_BROADCAST_INITIALIZER;
+	struct qdf_mac_addr bcastMac = QDF_MAC_ADDR_BCAST_INIT;
 #endif
 	eConnectionState connState;
 

+ 1 - 1
core/hdd/src/wlan_hdd_nan_datapath.c

@@ -601,7 +601,7 @@ void hdd_ndi_drv_ndi_create_rsp_handler(uint8_t vdev_id,
 	struct hdd_station_ctx *sta_ctx;
 	struct csr_roam_info roam_info = {0};
 	struct bss_description tmp_bss_descp = {0};
-	struct qdf_mac_addr bc_mac_addr = QDF_MAC_ADDR_BROADCAST_INITIALIZER;
+	struct qdf_mac_addr bc_mac_addr = QDF_MAC_ADDR_BCAST_INIT;
 
 	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {

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

@@ -665,7 +665,7 @@ static int hdd_set_grat_arp_keepalive(struct hdd_adapter *adapter)
 	struct hdd_station_ctx *sta_ctx;
 	tSirKeepAliveReq req = {
 		.packetType = SIR_KEEP_ALIVE_UNSOLICIT_ARP_RSP,
-		.dest_macaddr = QDF_MAC_ADDR_BROADCAST_INITIALIZER,
+		.dest_macaddr = QDF_MAC_ADDR_BCAST_INIT,
 	};
 
 	if (!adapter) {
@@ -1999,8 +1999,8 @@ static int __wlan_hdd_cfg80211_set_txpower(struct wiphy *wiphy,
 {
 	struct hdd_context *hdd_ctx = (struct hdd_context *) wiphy_priv(wiphy);
 	tHalHandle hHal = NULL;
-	struct qdf_mac_addr bssid = QDF_MAC_ADDR_BROADCAST_INITIALIZER;
-	struct qdf_mac_addr selfMac = QDF_MAC_ADDR_BROADCAST_INITIALIZER;
+	struct qdf_mac_addr bssid = QDF_MAC_ADDR_BCAST_INIT;
+	struct qdf_mac_addr selfMac = QDF_MAC_ADDR_BCAST_INIT;
 	int status;
 
 	ENTER();

+ 1 - 2
core/hdd/src/wlan_hdd_softap_tx_rx.c

@@ -1001,8 +1001,7 @@ QDF_STATUS hdd_softap_register_bc_sta(struct hdd_adapter *adapter,
 {
 	QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE;
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
-	struct qdf_mac_addr broadcastMacAddr =
-					QDF_MAC_ADDR_BROADCAST_INITIALIZER;
+	struct qdf_mac_addr broadcastMacAddr = QDF_MAC_ADDR_BCAST_INIT;
 	struct hdd_ap_ctx *ap_ctx;
 
 	ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);

+ 3 - 3
core/sme/src/csr/csr_api_roam.c

@@ -4106,7 +4106,7 @@ QDF_STATUS csr_roam_issue_disassociate(tpAniSirGlobal pMac, uint32_t sessionId,
 				       bool fMICFailure)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
-	struct qdf_mac_addr bssId = QDF_MAC_ADDR_BROADCAST_INITIALIZER;
+	struct qdf_mac_addr bssId = QDF_MAC_ADDR_BCAST_INIT;
 	uint16_t reasonCode;
 	struct csr_roam_session *pSession = CSR_GET_SESSION(pMac, sessionId);
 
@@ -4254,7 +4254,7 @@ csr_roam_get_associated_stas(tpAniSirGlobal pMac, uint32_t sessionId,
 			     void *pfnSapEventCallback, uint8_t *pAssocStasBuf)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
-	struct qdf_mac_addr bssId = QDF_MAC_ADDR_BROADCAST_INITIALIZER;
+	struct qdf_mac_addr bssId = QDF_MAC_ADDR_BCAST_INIT;
 	struct csr_roam_session *pSession = CSR_GET_SESSION(pMac, sessionId);
 
 	if (!pSession) {
@@ -4284,7 +4284,7 @@ QDF_STATUS csr_roam_issue_deauth(tpAniSirGlobal pMac, uint32_t sessionId,
 				 enum csr_roam_substate NewSubstate)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
-	struct qdf_mac_addr bssId = QDF_MAC_ADDR_BROADCAST_INITIALIZER;
+	struct qdf_mac_addr bssId = QDF_MAC_ADDR_BCAST_INIT;
 	struct csr_roam_session *pSession = CSR_GET_SESSION(pMac, sessionId);
 
 	if (!pSession) {