Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d15b5f2 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by John W. Linville
Browse files

wireless: rtlwifi: throw away MAC_FMT and use %pM instead 



Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a401d2bb

drivers/net/wireless/rtlwifi/base.c

+5 −6
Original line number Diff line number Diff line
@@ -756,18 +756,17 @@ bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx) 
				return false;



			RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,

				 ("%s ACT_ADDBAREQ From :" MAC_FMT "\n",

				  is_tx ? "Tx" : "Rx", MAC_ARG(hdr->addr2)));

				 ("%s ACT_ADDBAREQ From :%pM\n",

				  is_tx ? "Tx" : "Rx", hdr->addr2));

			break;

		case ACT_ADDBARSP:

			RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,

				 ("%s ACT_ADDBARSP From :" MAC_FMT "\n",

				  is_tx ? "Tx" : "Rx", MAC_ARG(hdr->addr2)));

				 ("%s ACT_ADDBARSP From :%pM\n",

				  is_tx ? "Tx" : "Rx", hdr->addr2));

			break;

		case ACT_DELBA:

			RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,

				 ("ACT_ADDBADEL From :" MAC_FMT "\n",

				  MAC_ARG(hdr->addr2)));

				 ("ACT_ADDBADEL From :%pM\n", hdr->addr2));

			break;

		}

		break;

drivers/net/wireless/rtlwifi/cam.c

+2 −2
Original line number Diff line number Diff line
@@ -131,9 +131,9 @@ u8 rtl_cam_add_one_entry(struct ieee80211_hw *hw, u8 *mac_addr, 


	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

		 ("EntryNo:%x, ulKeyId=%x, ulEncAlg=%x, "

		  "ulUseDK=%x MacAddr" MAC_FMT "\n",

		  "ulUseDK=%x MacAddr %pM\n",

		  ul_entry_idx, ul_key_id, ul_enc_alg,

		  ul_default_key, MAC_ARG(mac_addr)));

		  ul_default_key, mac_addr));



	if (ul_key_id == TOTAL_CAM_ENTRY) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,

drivers/net/wireless/rtlwifi/core.c

+3 −3
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ static int rtl_op_sta_add(struct ieee80211_hw *hw, 
			sta_entry->wireless_mode = WIRELESS_MODE_G;



		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,

			("Add sta addr is "MAC_FMT"\n", MAC_ARG(sta->addr)));

			("Add sta addr is %pM\n", sta->addr));

		rtlpriv->cfg->ops->update_rate_tbl(hw, sta, 0);

	}

	return 0;
@@ -469,7 +469,7 @@ static int rtl_op_sta_remove(struct ieee80211_hw *hw, 
	struct rtl_sta_info *sta_entry;

	if (sta) {

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,

			("Remove sta addr is "MAC_FMT"\n", MAC_ARG(sta->addr)));

			("Remove sta addr is %pM\n", sta->addr));

		sta_entry = (struct rtl_sta_info *) sta->drv_priv;

		sta_entry->wireless_mode = 0;

		sta_entry->ratr_index = 0;
@@ -678,7 +678,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, 
					      (u8 *) bss_conf->bssid);



		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,

			 (MAC_FMT "\n", MAC_ARG(bss_conf->bssid)));

			 ("%pM\n", bss_conf->bssid));



		mac->vendor = PEER_UNKNOWN;

		memcpy(mac->bssid, bss_conf->bssid, 6);

drivers/net/wireless/rtlwifi/debug.h

+0 −5
Original line number Diff line number Diff line
@@ -204,10 +204,5 @@ enum dbgp_flag_e { 
		} \

	} while (0);



#define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x"

#define MAC_ARG(x) \

	((u8 *)(x))[0], ((u8 *)(x))[1], ((u8 *)(x))[2],\

	((u8 *)(x))[3], ((u8 *)(x))[4], ((u8 *)(x))[5]



void rtl_dbgp_flag_init(struct ieee80211_hw *hw);

#endif

drivers/net/wireless/rtlwifi/rtl8192ce/hw.c

+1 −1
Original line number Diff line number Diff line
@@ -1592,7 +1592,7 @@ static void _rtl92ce_read_adapter_info(struct ieee80211_hw *hw) 
	}



	RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,

		 (MAC_FMT "\n", MAC_ARG(rtlefuse->dev_addr)));

		 ("%pM\n", rtlefuse->dev_addr));



	_rtl92ce_read_txpower_info_from_hwpg(hw,

					     rtlefuse->autoload_failflag,