Commit bbda3ac4 authored by Ross Schmidt's avatar Ross Schmidt Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: remove MAC_FMT macro 



Remove unnecessary macro for %pM and call it directly.

Signed-off-by: default avatarRoss Schmidt <ross.schm.dev@gmail.com>
Link: https://lore.kernel.org/r/20201105034754.12383-1-ross.schm.dev@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 773cfe06

drivers/staging/rtl8723bs/core/rtw_ap.c

+13 −26
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ u8 chk_sta_is_alive(struct sta_info *psta) 
{

	#ifdef DBG_EXPIRATION_CHK

	DBG_871X(

		"sta:"MAC_FMT", rssi:%d, rx:"STA_PKTS_FMT", expire_to:%u, %s%ssq_len:%u\n"

		"sta:%pM, rssi:%d, rx:"STA_PKTS_FMT", expire_to:%u, %s%ssq_len:%u\n"

		, MAC_ARG(psta->hwaddr)

		, psta->rssi_stat.UndecoratedSmoothedPWDB

		/*  STA_RX_PKTS_ARG(psta) */
@@ -297,7 +297,7 @@ void expire_timeout_chk(struct adapter *padapter) 
					psta->expire_to = pstapriv->expire_to;

					psta->state |= WIFI_STA_ALIVE_CHK_STATE;



					/* DBG_871X("alive chk, sta:" MAC_FMT " is at ps mode!\n", MAC_ARG(psta->hwaddr)); */

					/* DBG_871X("alive chk, sta:%pM is at ps mode!\n", MAC_ARG(psta->hwaddr)); */



					/* to update bcn with tim_bitmap for this station */

					pstapriv->tim_bitmap |= BIT(psta->aid);
@@ -319,7 +319,7 @@ void expire_timeout_chk(struct adapter *padapter) 
			list_del_init(&psta->asoc_list);

			pstapriv->asoc_list_cnt--;

			DBG_871X(

				"asoc expire "MAC_FMT", state = 0x%x\n",

				"asoc expire %pM, state = 0x%x\n",

				MAC_ARG(psta->hwaddr),

				psta->state

			);
@@ -332,7 +332,7 @@ void expire_timeout_chk(struct adapter *padapter) 
				) / 2)

			) {

				DBG_871X(

					"%s sta:"MAC_FMT", sleepq_len:%u, free_xmitframe_cnt:%u, asoc_list_cnt:%u, clear sleep_q\n",

					"%s sta:%pM, sleepq_len:%u, free_xmitframe_cnt:%u, asoc_list_cnt:%u, clear sleep_q\n",

					__func__,

					MAC_ARG(psta->hwaddr),

					psta->sleepq_len,
@@ -372,7 +372,7 @@ void expire_timeout_chk(struct adapter *padapter) 
			psta->keep_alive_trycnt++;

			if (ret == _SUCCESS) {

				DBG_871X(

					"asoc check, sta(" MAC_FMT ") is alive\n",

					"asoc check, sta(%pM) is alive\n",

					MAC_ARG(psta->hwaddr)

					);

				psta->expire_to = pstapriv->expire_to;
@@ -387,9 +387,7 @@ void expire_timeout_chk(struct adapter *padapter) 
			}



			psta->keep_alive_trycnt = 0;

			DBG_871X(

				"asoc expire "MAC_FMT", state = 0x%x\n",

				MAC_ARG(psta->hwaddr),

			DBG_871X("asoc expire %pM, state = 0x%x\n", MAC_ARG(psta->hwaddr),

				 psta->state);

			spin_lock_bh(&pstapriv->asoc_list_lock);

			if (list_empty(&psta->asoc_list) == false) {
@@ -1335,12 +1333,7 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr) 
	struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;

	struct __queue	*pacl_node_q = &pacl_list->acl_node_q;



	DBG_871X(

		"%s(acl_num =%d) =" MAC_FMT "\n",

		__func__,

		pacl_list->num,

		MAC_ARG(addr)

	);

	DBG_871X("%s(acl_num =%d) =%pM\n", __func__, pacl_list->num, MAC_ARG(addr));



	if ((NUM_ACL - 1) < pacl_list->num)

		return (-1);
@@ -1404,12 +1397,7 @@ void rtw_acl_remove_sta(struct adapter *padapter, u8 *addr) 
	struct __queue	*pacl_node_q = &pacl_list->acl_node_q;

	u8 baddr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };	/* Baddr is used for clearing acl_list */



	DBG_871X(

		"%s(acl_num =%d) =" MAC_FMT "\n",

		__func__,

		pacl_list->num,

		MAC_ARG(addr)

	);

	DBG_871X("%s(acl_num =%d) =%pM\n", __func__, pacl_list->num, MAC_ARG(addr));



	spin_lock_bh(&(pacl_node_q->lock));
@@ -2021,7 +2009,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) 
	if (psta->flags & WLAN_STA_HT) {

		u16 ht_capab = le16_to_cpu(psta->htpriv.ht_cap.cap_info);



		DBG_871X("HT: STA " MAC_FMT " HT Capabilities "

		DBG_871X("HT: STA %pM HT Capabilities "

			   "Info: 0x%04x\n", MAC_ARG(psta->hwaddr), ht_capab);



		if (psta->no_ht_set) {
@@ -2034,7 +2022,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) 
				psta->no_ht_gf_set = 1;

				pmlmepriv->num_sta_ht_no_gf++;

			}

			DBG_871X("%s STA " MAC_FMT " - no "

			DBG_871X("%s STA %pM - no "

				   "greenfield, num of non-gf stations %d\n",

				   __func__, MAC_ARG(psta->hwaddr),

				   pmlmepriv->num_sta_ht_no_gf);
@@ -2045,7 +2033,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) 
				psta->ht_20mhz_set = 1;

				pmlmepriv->num_sta_ht_20mhz++;

			}

			DBG_871X("%s STA " MAC_FMT " - 20 MHz HT, "

			DBG_871X("%s STA %pM - 20 MHz HT, "

				   "num of 20MHz HT STAs %d\n",

				   __func__, MAC_ARG(psta->hwaddr),

				   pmlmepriv->num_sta_ht_20mhz);
@@ -2057,8 +2045,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) 
			pmlmepriv->num_sta_no_ht++;

		}

		if (pmlmepriv->htpriv.ht_option == true) {

			DBG_871X("%s STA " MAC_FMT

				   " - no HT, num of non-HT stations %d\n",

			DBG_871X("%s STA %pM - no HT, num of non-HT stations %d\n",

				   __func__, MAC_ARG(psta->hwaddr),

				   pmlmepriv->num_sta_no_ht);

		}

drivers/staging/rtl8723bs/core/rtw_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -1024,7 +1024,7 @@ u8 rtw_clearstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 enqueu 


	if (!enqueue) {

		while ((cam_id = rtw_camid_search(padapter, sta->hwaddr, -1)) >= 0) {

			DBG_871X_LEVEL(_drv_always_, "clear key for addr:"MAC_FMT", camid:%d\n", MAC_ARG(sta->hwaddr), cam_id);

			DBG_871X_LEVEL(_drv_always_, "clear key for addr:%pM, camid:%d\n", MAC_ARG(sta->hwaddr), cam_id);

			clear_cam_entry(padapter, cam_id);

			rtw_camid_free(padapter, cam_id);

		}

drivers/staging/rtl8723bs/core/rtw_ieee80211.c

+1 −1
Original line number Diff line number Diff line
@@ -1127,7 +1127,7 @@ void rtw_macaddr_cfg(struct device *dev, u8 *mac_addr) 
		}

	}



	DBG_871X("rtw_macaddr_cfg MAC Address  = "MAC_FMT"\n", MAC_ARG(mac_addr));

	DBG_871X("rtw_macaddr_cfg MAC Address  = %pM\n", MAC_ARG(mac_addr));

}



static int rtw_get_cipher_info(struct wlan_network *pnetwork)

drivers/staging/rtl8723bs/core/rtw_ioctl_set.c

+2 −2
Original line number Diff line number Diff line
@@ -189,8 +189,8 @@ u8 rtw_set_802_11_bssid(struct adapter *padapter, u8 *bssid) 
				goto release_mlme_lock;/* it means driver is in WIFI_ADHOC_MASTER_STATE, we needn't create bss again. */

		} else {

			RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("Set BSSID not the same bssid\n"));

			RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("set_bssid ="MAC_FMT"\n", MAC_ARG(bssid)));

			RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("cur_bssid ="MAC_FMT"\n", MAC_ARG(pmlmepriv->cur_network.network.MacAddress)));

			RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("set_bssid =%pM\n", MAC_ARG(bssid)));

			RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("cur_bssid =%pM\n", MAC_ARG(pmlmepriv->cur_network.network.MacAddress)));



			rtw_disassoc_cmd(padapter, 0, true);

drivers/staging/rtl8723bs/core/rtw_mlme.c

+12 −12
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src, 


	#if defined(DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) && 1

	if (strcmp(dst->Ssid.Ssid, DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) == 0) {

		DBG_871X(FUNC_ADPT_FMT" %s("MAC_FMT", ch%u) ss_ori:%3u, sq_ori:%3u, rssi_ori:%3ld, ss_smp:%3u, sq_smp:%3u, rssi_smp:%3ld\n"

		DBG_871X(FUNC_ADPT_FMT" %s(%pM, ch%u) ss_ori:%3u, sq_ori:%3u, rssi_ori:%3ld, ss_smp:%3u, sq_smp:%3u, rssi_smp:%3ld\n"

			, FUNC_ADPT_ARG(padapter)

			, src->Ssid.Ssid, MAC_ARG(src->MacAddress), src->Configuration.DSConfig

			, ss_ori, sq_ori, rssi_ori
@@ -539,7 +539,7 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src, 


	#if defined(DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) && 1

	if (strcmp(dst->Ssid.Ssid, DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) == 0) {

		DBG_871X(FUNC_ADPT_FMT" %s("MAC_FMT"), SignalStrength:%u, SignalQuality:%u, RawRSSI:%ld\n"

		DBG_871X(FUNC_ADPT_FMT" %s(%pM), SignalStrength:%u, SignalQuality:%u, RawRSSI:%ld\n"

			, FUNC_ADPT_ARG(padapter)

			, dst->Ssid.Ssid, MAC_ARG(dst->MacAddress), dst->PhyInfo.SignalStrength, dst->PhyInfo.SignalQuality, dst->Rssi);

	}
@@ -986,7 +986,7 @@ void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue) 
	struct debug_priv *pdbgpriv = &psdpriv->drv_dbg;



	RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, ("+rtw_free_assoc_resources\n"));

	RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("tgt_network->network.MacAddress ="MAC_FMT" ssid =%s\n",

	RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("tgt_network->network.MacAddress =%pM ssid =%s\n",

		MAC_ARG(tgt_network->network.MacAddress), tgt_network->network.Ssid.Ssid));



	if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_AP_STATE)) {
@@ -1221,7 +1221,7 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net 


	DBG_871X("%s\n", __func__);



	RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("\nfw_state:%x, BSSID:"MAC_FMT"\n"

	RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("\nfw_state:%x, BSSID:%pM\n"

		, get_fwstate(pmlmepriv), MAC_ARG(pnetwork->network.MacAddress)));



	/*  why not use ptarget_wlan?? */
@@ -1578,7 +1578,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) 
	else

		mac_id = pstadel->mac_id;



	DBG_871X("%s(mac_id =%d) =" MAC_FMT "\n", __func__, mac_id, MAC_ARG(pstadel->macaddr));

	DBG_871X("%s(mac_id =%d) =%pM\n", __func__, mac_id, MAC_ARG(pstadel->macaddr));



	if (mac_id >= 0) {

		u16 media_status;
@@ -1889,7 +1889,7 @@ static int rtw_check_roaming_candidate(struct mlme_priv *mlme 
	if (rtw_is_desired_network(adapter, competitor) == false)

		goto exit;



	DBG_871X("roam candidate:%s %s("MAC_FMT", ch%3u) rssi:%d, age:%5d\n",

	DBG_871X("roam candidate:%s %s(%pM, ch%3u) rssi:%d, age:%5d\n",

		(competitor == mlme->cur_network_scanned)?"*":" ",

		competitor->network.Ssid.Ssid,

		MAC_ARG(competitor->network.MacAddress),
@@ -1951,7 +1951,7 @@ int rtw_select_roaming_candidate(struct mlme_priv *mlme) 


		mlme->pscanned = get_next(mlme->pscanned);



		DBG_871X("%s("MAC_FMT", ch%u) rssi:%d\n"

		DBG_871X("%s(%pM, ch%u) rssi:%d\n"

			, pnetwork->network.Ssid.Ssid

			, MAC_ARG(pnetwork->network.MacAddress)

			, pnetwork->network.Configuration.DSConfig
@@ -1966,7 +1966,7 @@ int rtw_select_roaming_candidate(struct mlme_priv *mlme) 
		ret = _FAIL;

		goto exit;

	} else {

		DBG_871X("%s: candidate: %s("MAC_FMT", ch:%u)\n", __func__,

		DBG_871X("%s: candidate: %s(%pM, ch:%u)\n", __func__,

			candidate->network.Ssid.Ssid, MAC_ARG(candidate->network.MacAddress),

			candidate->network.Configuration.DSConfig);
@@ -2026,7 +2026,7 @@ static int rtw_check_join_candidate(struct mlme_priv *mlme 
	if (updated) {

		DBG_871X("[by_bssid:%u][assoc_ssid:%s]"

			"[to_roam:%u] "

			"new candidate: %s("MAC_FMT", ch%u) rssi:%d\n",

			"new candidate: %s(%pM, ch%u) rssi:%d\n",

			mlme->assoc_by_bssid,

			mlme->assoc_ssid.Ssid,

			rtw_to_roam(adapter),
@@ -2081,7 +2081,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv) 


		pmlmepriv->pscanned = get_next(pmlmepriv->pscanned);



		DBG_871X("%s("MAC_FMT", ch%u) rssi:%d\n"

		DBG_871X("%s(%pM, ch%u) rssi:%d\n"

			, pnetwork->network.Ssid.Ssid

			, MAC_ARG(pnetwork->network.MacAddress)

			, pnetwork->network.Configuration.DSConfig
@@ -2099,7 +2099,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv) 
		ret = _FAIL;

		goto exit;

	} else {

		DBG_871X("%s: candidate: %s("MAC_FMT", ch:%u)\n", __func__,

		DBG_871X("%s: candidate: %s(%pM, ch:%u)\n", __func__,

			candidate->network.Ssid.Ssid, MAC_ARG(candidate->network.MacAddress),

			candidate->network.Configuration.DSConfig);

		goto candidate_exist;
@@ -2941,7 +2941,7 @@ void _rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network) 
	int do_join_r;



	if (0 < rtw_to_roam(padapter)) {

		DBG_871X("roaming from %s("MAC_FMT"), length:%d\n",

		DBG_871X("roaming from %s(%pM), length:%d\n",

				cur_network->network.Ssid.Ssid, MAC_ARG(cur_network->network.MacAddress),

				cur_network->network.Ssid.SsidLength);

		memcpy(&pmlmepriv->assoc_ssid, &cur_network->network.Ssid, sizeof(struct ndis_802_11_ssid));