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

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

rtlwifi: rtl8192ce: rtl8192cu: use %*phC to dump small buffers 



The patch changes a bit trace output format in the rtl_cam_program_entry() to
print prefix and the actual data on the same line. Moreover the %*phC outputs
each byte as 2 hex digits, which is slightly different to the original %x.

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

drivers/net/wireless/rtlwifi/cam.c

+2 −5
Original line number Diff line number Diff line
@@ -52,11 +52,8 @@ static void rtl_cam_program_entry(struct ieee80211_hw *hw, u32 entry_no, 
	u32 target_content = 0;

	u8 entry_i;



	RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,

		 "key_cont_128:\n %x:%x:%x:%x:%x:%x\n",

		 key_cont_128[0], key_cont_128[1],

		 key_cont_128[2], key_cont_128[3],

		 key_cont_128[4], key_cont_128[5]);

	RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "key_cont_128: %6phC\n",

		 key_cont_128);



	for (entry_i = 0; entry_i < CAM_CONTENT_COUNT; entry_i++) {

		target_command = entry_i + CAM_CONTENT_COUNT * entry_no;

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

+2 −4
Original line number Diff line number Diff line
@@ -1918,10 +1918,8 @@ static void rtl92ce_update_hal_rate_mask(struct ieee80211_hw *hw, 
				     (ratr_index << 28);

	rate_mask[4] = macid | (shortgi ? 0x20 : 0x00) | 0x80;

	RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,

		 "Rate_index:%x, ratr_val:%x, %x:%x:%x:%x:%x\n",

		 ratr_index, ratr_bitmap,

		 rate_mask[0], rate_mask[1], rate_mask[2], rate_mask[3],

		 rate_mask[4]);

		 "Rate_index:%x, ratr_val:%x, %5phC\n",

		 ratr_index, ratr_bitmap, rate_mask);

	rtl92c_fill_h2c_cmd(hw, H2C_RA_MASK, 5, rate_mask);



	if (macid != 0)

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

+2 −4
Original line number Diff line number Diff line
@@ -2169,10 +2169,8 @@ void rtl92cu_update_hal_rate_mask(struct ieee80211_hw *hw, u8 rssi_level) 
				      ratr_index << 28);

	rate_mask[4] = macid | (shortgi ? 0x20 : 0x00) | 0x80;

	RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,

		 "Rate_index:%x, ratr_val:%x, %x:%x:%x:%x:%x\n",

		 ratr_index, ratr_bitmap,

		 rate_mask[0], rate_mask[1], rate_mask[2], rate_mask[3],

		 rate_mask[4]);

		 "Rate_index:%x, ratr_val:%x, %5phC\n",

		 ratr_index, ratr_bitmap, rate_mask);

	rtl92c_fill_h2c_cmd(hw, H2C_RA_MASK, 5, rate_mask);

}