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

Commit f30d7507 authored by Joe Perches's avatar Joe Perches Committed by John W. Linville
Browse files

rtlwifi: Convert RT_TRACE macro to use ##__VA_ARGS__ 



Consolidate printks to avoid possible message interleaving
and reduce the object size.

Remove unnecessary RT_TRACE parentheses.

Miscellaneous typo and grammar fixes.
Add missing newlines to formats.
Remove duplicate KERN_DEBUG prefixes.
Coalesce formats.
Align arguments.

$ size drivers/net/wireless/rtlwifi/built-in.o*
   text    data     bss     dec     hex filename
 594841   55333  129680  779854   be64e drivers/net/wireless/rtlwifi/built-in.o.new
 607022   55333  138720  801075   c3933 drivers/net/wireless/rtlwifi/built-in.o.old

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent af08687b

drivers/net/wireless/rtlwifi/base.c

+27 −29
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ static void _rtl_init_hw_ht_capab(struct ieee80211_hw *hw, 
	 */

	if (get_rf_type(rtlphy) == RF_1T2R || get_rf_type(rtlphy) == RF_2T2R) {



		RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("1T2R or 2T2R\n"));

		RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "1T2R or 2T2R\n");



		ht_cap->mcs.rx_mask[0] = 0xFF;

		ht_cap->mcs.rx_mask[1] = 0xFF;
@@ -220,7 +220,7 @@ static void _rtl_init_hw_ht_capab(struct ieee80211_hw *hw, 
		ht_cap->mcs.rx_highest = cpu_to_le16(MAX_BIT_RATE_40MHZ_MCS15);

	} else if (get_rf_type(rtlphy) == RF_1T1R) {



		RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("1T1R\n"));

		RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "1T1R\n");



		ht_cap->mcs.rx_mask[0] = 0xFF;

		ht_cap->mcs.rx_mask[1] = 0x00;
@@ -302,9 +302,8 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw) 
			/* <4> set mac->sband to wiphy->sband */

			hw->wiphy->bands[IEEE80211_BAND_5GHZ] = sband;

		} else {

			RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,

				 ("Err BAND %d\n",

				 rtlhal->current_bandtype));

			RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, "Err BAND %d\n",

				 rtlhal->current_bandtype);

		}

	}

	/* <5> set hw caps */
@@ -436,13 +435,13 @@ int rtl_init_core(struct ieee80211_hw *hw) 
	 * mac80211 hw  in _rtl_init_mac80211.

	 */

	if (rtl_regd_init(hw, rtl_reg_notifier)) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("REGD init failed\n"));

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "REGD init failed\n");

		return 1;

	} else {

		/* CRDA regd hint must after init CRDA */

		if (regulatory_hint(hw->wiphy, rtlpriv->regd.alpha2)) {

			RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,

				 ("regulatory_hint fail\n"));

				 "regulatory_hint fail\n");

		}

	}
@@ -922,17 +921,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 :%pM\n",

				  is_tx ? "Tx" : "Rx", 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 :%pM\n",

				  is_tx ? "Tx" : "Rx", 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 :%pM\n", hdr->addr2));

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

			break;

		}

		break;
@@ -975,8 +974,8 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx) 
				 * 67 : UDP BOOTP server

				 */

				RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV),

					 DBG_DMESG, ("dhcp %s !!\n",

						     (is_tx) ? "Tx" : "Rx"));

					 DBG_DMESG, "dhcp %s !!\n",

					 is_tx ? "Tx" : "Rx");



				if (is_tx) {

					rtl_lps_leave(hw);
@@ -996,7 +995,7 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx) 
		return true;

	} else if (ETH_P_PAE == ether_type) {

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

			 ("802.1X %s EAPOL pkt!!\n", (is_tx) ? "Tx" : "Rx"));

			 "802.1X %s EAPOL pkt!!\n", is_tx ? "Tx" : "Rx");



		if (is_tx) {

			rtl_lps_leave(hw);
@@ -1036,9 +1035,8 @@ int rtl_tx_agg_start(struct ieee80211_hw *hw, 
		return -ENXIO;

	tid_data = &sta_entry->tids[tid];



	RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG,

		 ("on ra = %pM tid = %d seq:%d\n", sta->addr, tid,

		 tid_data->seq_number));

	RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG, "on ra = %pM tid = %d seq:%d\n",

		 sta->addr, tid, tid_data->seq_number);



	*ssn = tid_data->seq_number;

	tid_data->agg.agg_state = RTL_AGG_START;
@@ -1059,12 +1057,12 @@ int rtl_tx_agg_stop(struct ieee80211_hw *hw, 
		return -EINVAL;



	if (!sta->addr) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("ra = NULL\n"));

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "ra = NULL\n");

		return -EINVAL;

	}



	RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG,

		 ("on ra = %pM tid = %d\n", sta->addr, tid));

	RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG, "on ra = %pM tid = %d\n",

		 sta->addr, tid);



	if (unlikely(tid >= MAX_TID_COUNT))

		return -EINVAL;
@@ -1087,12 +1085,12 @@ int rtl_tx_agg_oper(struct ieee80211_hw *hw, 
		return -EINVAL;



	if (!sta->addr) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("ra = NULL\n"));

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "ra = NULL\n");

		return -EINVAL;

	}



	RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG,

		 ("on ra = %pM tid = %d\n", sta->addr, tid));

	RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG, "on ra = %pM tid = %d\n",

		 sta->addr, tid);



	if (unlikely(tid >= MAX_TID_COUNT))

		return -EINVAL;
@@ -1474,29 +1472,29 @@ void rtl_recognize_peer(struct ieee80211_hw *hw, u8 *data, unsigned int len) 
		(memcmp(mac->bssid, ap5_6, 3) == 0) ||

		vendor == PEER_ATH) {

		vendor = PEER_ATH;

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, ("=>ath find\n"));

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>ath find\n");

	} else if ((memcmp(mac->bssid, ap4_4, 3) == 0) ||

		(memcmp(mac->bssid, ap4_5, 3) == 0) ||

		(memcmp(mac->bssid, ap4_1, 3) == 0) ||

		(memcmp(mac->bssid, ap4_2, 3) == 0) ||

		(memcmp(mac->bssid, ap4_3, 3) == 0) ||

		vendor == PEER_RAL) {

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, ("=>ral findn\n"));

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>ral find\n");

		vendor = PEER_RAL;

	} else if (memcmp(mac->bssid, ap6_1, 3) == 0 ||

		vendor == PEER_CISCO) {

		vendor = PEER_CISCO;

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, ("=>cisco find\n"));

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>cisco find\n");

	} else if ((memcmp(mac->bssid, ap3_1, 3) == 0) ||

		(memcmp(mac->bssid, ap3_2, 3) == 0) ||

		(memcmp(mac->bssid, ap3_3, 3) == 0) ||

		vendor == PEER_BROAD) {

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, ("=>broad find\n"));

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>broad find\n");

		vendor = PEER_BROAD;

	} else if (memcmp(mac->bssid, ap7_1, 3) == 0 ||

		vendor == PEER_MARV) {

		vendor = PEER_MARV;

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, ("=>marv find\n"));

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>marv find\n");

	}



	mac->vendor = vendor;

drivers/net/wireless/rtlwifi/cam.c

+38 −43
Original line number Diff line number Diff line
@@ -55,10 +55,10 @@ static void rtl_cam_program_entry(struct ieee80211_hw *hw, u32 entry_no, 
	u8 entry_i;



	RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,

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

		 "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]));

		 key_cont_128[4], key_cont_128[5]);



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

		target_command = entry_i + CAM_CONTENT_COUNT * entry_no;
@@ -73,14 +73,12 @@ static void rtl_cam_program_entry(struct ieee80211_hw *hw, u32 entry_no, 
			rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM],

					target_command);



			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "WRITE %x: %x\n",

				 rtlpriv->cfg->maps[WCAMI], target_content);

			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,

				 ("WRITE %x: %x\n",

				  rtlpriv->cfg->maps[WCAMI], target_content));

			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,

				 ("The Key ID is %d\n", entry_no));

			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,

				 ("WRITE %x: %x\n",

				  rtlpriv->cfg->maps[RWCAM], target_command));

				 "The Key ID is %d\n", entry_no);

			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "WRITE %x: %x\n",

				 rtlpriv->cfg->maps[RWCAM], target_command);



		} else if (entry_i == 1) {
@@ -94,10 +92,10 @@ static void rtl_cam_program_entry(struct ieee80211_hw *hw, u32 entry_no, 
			rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM],

					target_command);



			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,

				 ("WRITE A4: %x\n", target_content));

			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,

				 ("WRITE A0: %x\n", target_command));

			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "WRITE A4: %x\n",

				 target_content);

			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "WRITE A0: %x\n",

				 target_command);



		} else {
@@ -114,15 +112,15 @@ static void rtl_cam_program_entry(struct ieee80211_hw *hw, u32 entry_no, 
					target_command);

			udelay(100);



			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,

				 ("WRITE A4: %x\n", target_content));

			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,

				 ("WRITE A0: %x\n", target_command));

			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "WRITE A4: %x\n",

				 target_content);

			RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "WRITE A0: %x\n",

				 target_command);

		}

	}



	RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,

		 ("after set key, usconfig:%x\n", us_config));

	RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "after set key, usconfig:%x\n",

		 us_config);

}



u8 rtl_cam_add_one_entry(struct ieee80211_hw *hw, u8 *mac_addr,
@@ -133,14 +131,13 @@ u8 rtl_cam_add_one_entry(struct ieee80211_hw *hw, u8 *mac_addr, 
	struct rtl_priv *rtlpriv = rtl_priv(hw);



	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

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

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

		 "EntryNo:%x, ulKeyId=%x, ulEncAlg=%x, ulUseDK=%x MacAddr %pM\n",

		 ul_entry_idx, ul_key_id, ul_enc_alg,

		  ul_default_key, mac_addr));

		 ul_default_key, mac_addr);



	if (ul_key_id == TOTAL_CAM_ENTRY) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,

			 ("<=== ulKeyId exceed!\n"));

			 "<=== ulKeyId exceed!\n");

		return 0;

	}
@@ -153,7 +150,7 @@ u8 rtl_cam_add_one_entry(struct ieee80211_hw *hw, u8 *mac_addr, 
	rtl_cam_program_entry(hw, ul_entry_idx, mac_addr,

			      (u8 *) key_content, us_config);



	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, ("<===\n"));

	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "<===\n");



	return 1;
@@ -166,7 +163,7 @@ int rtl_cam_delete_one_entry(struct ieee80211_hw *hw, 
	u32 ul_command;

	struct rtl_priv *rtlpriv = rtl_priv(hw);



	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, ("key_idx:%d\n", ul_key_id));

	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "key_idx:%d\n", ul_key_id);



	ul_command = ul_key_id * CAM_CONTENT_COUNT;

	ul_command = ul_command | BIT(31) | BIT(16);
@@ -175,9 +172,9 @@ int rtl_cam_delete_one_entry(struct ieee80211_hw *hw, 
	rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM], ul_command);



	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

		 ("rtl_cam_delete_one_entry(): WRITE A4: %x\n", 0));

		 "rtl_cam_delete_one_entry(): WRITE A4: %x\n", 0);

	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

		 ("rtl_cam_delete_one_entry(): WRITE A0: %x\n", ul_command));

		 "rtl_cam_delete_one_entry(): WRITE A0: %x\n", ul_command);



	return 0;
@@ -229,9 +226,9 @@ void rtl_cam_mark_invalid(struct ieee80211_hw *hw, u8 uc_index) 
	rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM], ul_command);



	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

		 ("rtl_cam_mark_invalid(): WRITE A4: %x\n", ul_content));

		 "rtl_cam_mark_invalid(): WRITE A4: %x\n", ul_content);

	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

		 ("rtl_cam_mark_invalid(): WRITE A0: %x\n", ul_command));

		 "rtl_cam_mark_invalid(): WRITE A0: %x\n", ul_command);

}

EXPORT_SYMBOL(rtl_cam_mark_invalid);
@@ -279,11 +276,11 @@ void rtl_cam_empty_entry(struct ieee80211_hw *hw, u8 uc_index) 
		rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM], ul_command);



		RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,

			 ("rtl_cam_empty_entry(): WRITE A4: %x\n",

			  ul_content));

			 "rtl_cam_empty_entry(): WRITE A4: %x\n",

			 ul_content);

		RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,

			 ("rtl_cam_empty_entry(): WRITE A0: %x\n",

			  ul_command));

			 "rtl_cam_empty_entry(): WRITE A0: %x\n",

			 ul_command);

	}



}
@@ -297,8 +294,7 @@ u8 rtl_cam_get_free_entry(struct ieee80211_hw *hw, u8 *sta_addr) 
	u8 i, *addr;



	if (NULL == sta_addr) {

		RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG,

			("sta_addr is NULL.\n"));

		RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG, "sta_addr is NULL\n");

		return TOTAL_CAM_ENTRY;

	}

	/* Does STA already exist? */
@@ -311,8 +307,8 @@ u8 rtl_cam_get_free_entry(struct ieee80211_hw *hw, u8 *sta_addr) 
	for (entry_idx = 4; entry_idx < TOTAL_CAM_ENTRY; entry_idx++) {

		if ((bitmap & BIT(0)) == 0) {

			RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG,

				("-----hwsec_cam_bitmap: 0x%x entry_idx=%d\n",

				 rtlpriv->sec.hwsec_cam_bitmap, entry_idx));

				 "-----hwsec_cam_bitmap: 0x%x entry_idx=%d\n",

				 rtlpriv->sec.hwsec_cam_bitmap, entry_idx);

			rtlpriv->sec.hwsec_cam_bitmap |= BIT(0) << entry_idx;

			memcpy(rtlpriv->sec.hwsec_cam_sta_addr[entry_idx],

			       sta_addr, ETH_ALEN);
@@ -331,14 +327,13 @@ void rtl_cam_del_entry(struct ieee80211_hw *hw, u8 *sta_addr) 
	u8 i, *addr;



	if (NULL == sta_addr) {

		RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG,

			("sta_addr is NULL.\n"));

		RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG, "sta_addr is NULL\n");

	}



	if ((sta_addr[0]|sta_addr[1]|sta_addr[2]|sta_addr[3]|\

				sta_addr[4]|sta_addr[5]) == 0) {

		RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG,

			("sta_addr is 00:00:00:00:00:00.\n"));

			 "sta_addr is 00:00:00:00:00:00\n");

		return;

	}

	/* Does STA already exist? */

drivers/net/wireless/rtlwifi/core.c

+59 −61
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ static int rtl_op_add_interface(struct ieee80211_hw *hw, 


	if (mac->vif) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,

			 ("vif has been set!! mac->vif = 0x%p\n", mac->vif));

			 "vif has been set!! mac->vif = 0x%p\n", mac->vif);

		return -EOPNOTSUPP;

	}
@@ -125,7 +125,7 @@ static int rtl_op_add_interface(struct ieee80211_hw *hw, 
	case NL80211_IFTYPE_STATION:

		if (mac->beacon_enabled == 1) {

			RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,

				 ("NL80211_IFTYPE_STATION\n"));

				 "NL80211_IFTYPE_STATION\n");

			mac->beacon_enabled = 0;

			rtlpriv->cfg->ops->update_interrupt_mask(hw, 0,

					rtlpriv->cfg->maps
@@ -134,7 +134,7 @@ static int rtl_op_add_interface(struct ieee80211_hw *hw, 
		break;

	case NL80211_IFTYPE_ADHOC:

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,

			 ("NL80211_IFTYPE_ADHOC\n"));

			 "NL80211_IFTYPE_ADHOC\n");



		mac->link_state = MAC80211_LINKED;

		rtlpriv->cfg->ops->set_bcn_reg(hw);
@@ -148,7 +148,7 @@ static int rtl_op_add_interface(struct ieee80211_hw *hw, 
		break;

	case NL80211_IFTYPE_AP:

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,

			 ("NL80211_IFTYPE_AP\n"));

			 "NL80211_IFTYPE_AP\n");



		mac->link_state = MAC80211_LINKED;

		rtlpriv->cfg->ops->set_bcn_reg(hw);
@@ -161,7 +161,7 @@ static int rtl_op_add_interface(struct ieee80211_hw *hw, 
		break;

	default:

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 ("operation mode %d is not support!\n", vif->type));

			 "operation mode %d is not supported!\n", vif->type);

		err = -EOPNOTSUPP;

		goto out;

	}
@@ -221,7 +221,7 @@ static int rtl_op_config(struct ieee80211_hw *hw, u32 changed) 
	mutex_lock(&rtlpriv->locks.conf_mutex);

	if (changed & IEEE80211_CONF_CHANGE_LISTEN_INTERVAL) {	/*BIT(2)*/

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,

			 ("IEEE80211_CONF_CHANGE_LISTEN_INTERVAL\n"));

			 "IEEE80211_CONF_CHANGE_LISTEN_INTERVAL\n");

	}



	/*For IPS */
@@ -264,8 +264,8 @@ static int rtl_op_config(struct ieee80211_hw *hw, u32 changed) 


	if (changed & IEEE80211_CONF_CHANGE_RETRY_LIMITS) {

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,

			 ("IEEE80211_CONF_CHANGE_RETRY_LIMITS %x\n",

			  hw->conf.long_frame_max_tx_count));

			 "IEEE80211_CONF_CHANGE_RETRY_LIMITS %x\n",

			 hw->conf.long_frame_max_tx_count);

		mac->retry_long = hw->conf.long_frame_max_tx_count;

		mac->retry_short = hw->conf.long_frame_max_tx_count;

		rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RETRY_LIMIT,
@@ -320,7 +320,7 @@ static int rtl_op_config(struct ieee80211_hw *hw, u32 changed) 
		default:

			mac->bw_40 = false;

			RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

					("switch case not processed\n"));

				 "switch case not processed\n");

			break;

		}
@@ -369,12 +369,12 @@ static void rtl_op_configure_filter(struct ieee80211_hw *hw, 
			mac->rx_conf |= rtlpriv->cfg->maps[MAC_RCR_AM] |

			    rtlpriv->cfg->maps[MAC_RCR_AB];

			RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,

				 ("Enable receive multicast frame.\n"));

				 "Enable receive multicast frame\n");

		} else {

			mac->rx_conf &= ~(rtlpriv->cfg->maps[MAC_RCR_AM] |

					  rtlpriv->cfg->maps[MAC_RCR_AB]);

			RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,

				 ("Disable receive multicast frame.\n"));

				 "Disable receive multicast frame\n");

		}

	}
@@ -382,11 +382,11 @@ static void rtl_op_configure_filter(struct ieee80211_hw *hw, 
		if (*new_flags & FIF_FCSFAIL) {

			mac->rx_conf |= rtlpriv->cfg->maps[MAC_RCR_ACRC32];

			RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,

				 ("Enable receive FCS error frame.\n"));

				 "Enable receive FCS error frame\n");

		} else {

			mac->rx_conf &= ~rtlpriv->cfg->maps[MAC_RCR_ACRC32];

			RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,

				 ("Disable receive FCS error frame.\n"));

				 "Disable receive FCS error frame\n");

		}

	}
@@ -409,11 +409,11 @@ static void rtl_op_configure_filter(struct ieee80211_hw *hw, 
			mac->rx_conf |= rtlpriv->cfg->maps[MAC_RCR_ACF];



			RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,

				 ("Enable receive control frame.\n"));

				 "Enable receive control frame\n");

		} else {

			mac->rx_conf &= ~rtlpriv->cfg->maps[MAC_RCR_ACF];

			RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,

				 ("Disable receive control frame.\n"));

				 "Disable receive control frame\n");

		}

	}
@@ -421,11 +421,11 @@ static void rtl_op_configure_filter(struct ieee80211_hw *hw, 
		if (*new_flags & FIF_OTHER_BSS) {

			mac->rx_conf |= rtlpriv->cfg->maps[MAC_RCR_AAP];

			RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,

				 ("Enable receive other BSS's frame.\n"));

				 "Enable receive other BSS's frame\n");

		} else {

			mac->rx_conf &= ~rtlpriv->cfg->maps[MAC_RCR_AAP];

			RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,

				 ("Disable receive other BSS's frame.\n"));

				 "Disable receive other BSS's frame\n");

		}

	}

}
@@ -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 %pM\n", 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 %pM\n", 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;
@@ -514,7 +514,7 @@ static int rtl_op_conf_tx(struct ieee80211_hw *hw, 


	if (queue >= AC_MAX) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,

			 ("queue number %d is incorrect!\n", queue));

			 "queue number %d is incorrect!\n", queue);

		return -EINVAL;

	}
@@ -547,7 +547,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, 
		     bss_conf->enable_beacon)) {

			if (mac->beacon_enabled == 0) {

				RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,

					 ("BSS_CHANGED_BEACON_ENABLED\n"));

					 "BSS_CHANGED_BEACON_ENABLED\n");



				/*start hw beacon interrupt. */

				/*rtlpriv->cfg->ops->set_bcn_reg(hw); */
@@ -565,7 +565,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, 
			!bss_conf->enable_beacon)) {

			if (mac->beacon_enabled == 1) {

				RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,

					 ("ADHOC DISABLE BEACON\n"));

					 "ADHOC DISABLE BEACON\n");



				mac->beacon_enabled = 0;

				rtlpriv->cfg->ops->update_interrupt_mask(hw, 0,
@@ -575,7 +575,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, 
		}

		if (changed & BSS_CHANGED_BEACON_INT) {

			RT_TRACE(rtlpriv, COMP_BEACON, DBG_TRACE,

				 ("BSS_CHANGED_BEACON_INT\n"));

				 "BSS_CHANGED_BEACON_INT\n");

			mac->beacon_interval = bss_conf->beacon_int;

			rtlpriv->cfg->ops->set_bcn_intv(hw);

		}
@@ -604,7 +604,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, 
			if (mac->opmode == NL80211_IFTYPE_STATION && sta)

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

			RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,

				 ("BSS_CHANGED_ASSOC\n"));

				 "BSS_CHANGED_ASSOC\n");

		} else {

			if (mac->link_state == MAC80211_LINKED)

				rtl_lps_leave(hw);
@@ -619,20 +619,20 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, 
			mac->vendor = PEER_UNKNOWN;



			RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,

				 ("BSS_CHANGED_UN_ASSOC\n"));

				 "BSS_CHANGED_UN_ASSOC\n");

		}

	}



	if (changed & BSS_CHANGED_ERP_CTS_PROT) {

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,

			 ("BSS_CHANGED_ERP_CTS_PROT\n"));

			 "BSS_CHANGED_ERP_CTS_PROT\n");

		mac->use_cts_protect = bss_conf->use_cts_prot;

	}



	if (changed & BSS_CHANGED_ERP_PREAMBLE) {

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,

			 ("BSS_CHANGED_ERP_PREAMBLE use short preamble:%x\n",

			  bss_conf->use_short_preamble));

			 "BSS_CHANGED_ERP_PREAMBLE use short preamble:%x\n",

			 bss_conf->use_short_preamble);



		mac->short_preamble = bss_conf->use_short_preamble;

		rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_ACK_PREAMBLE,
@@ -641,7 +641,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, 


	if (changed & BSS_CHANGED_ERP_SLOT) {

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,

			 ("BSS_CHANGED_ERP_SLOT\n"));

			 "BSS_CHANGED_ERP_SLOT\n");



		if (bss_conf->use_short_slot)

			mac->slot_time = RTL_SLOT_TIME_9;
@@ -653,8 +653,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, 
	}



	if (changed & BSS_CHANGED_HT) {

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,

			 ("BSS_CHANGED_HT\n"));

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE, "BSS_CHANGED_HT\n");

		rcu_read_lock();

		sta = get_sta(hw, vif, bss_conf->bssid);

		if (sta) {
@@ -683,8 +682,8 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, 
		rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_BSSID,

					      (u8 *) bss_conf->bssid);



		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,

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

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG, "%pM\n",

			 bss_conf->bssid);



		mac->vendor = PEER_UNKNOWN;

		memcpy(mac->bssid, bss_conf->bssid, 6);
@@ -831,30 +830,30 @@ static int rtl_op_ampdu_action(struct ieee80211_hw *hw, 
	switch (action) {

	case IEEE80211_AMPDU_TX_START:

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,

			 ("IEEE80211_AMPDU_TX_START: TID:%d\n", tid));

			 "IEEE80211_AMPDU_TX_START: TID:%d\n", tid);

		return rtl_tx_agg_start(hw, sta, tid, ssn);

		break;

	case IEEE80211_AMPDU_TX_STOP:

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,

			 ("IEEE80211_AMPDU_TX_STOP: TID:%d\n", tid));

			 "IEEE80211_AMPDU_TX_STOP: TID:%d\n", tid);

		return rtl_tx_agg_stop(hw, sta, tid);

		break;

	case IEEE80211_AMPDU_TX_OPERATIONAL:

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,

			 ("IEEE80211_AMPDU_TX_OPERATIONAL:TID:%d\n", tid));

			 "IEEE80211_AMPDU_TX_OPERATIONAL:TID:%d\n", tid);

		rtl_tx_agg_oper(hw, sta, tid);

		break;

	case IEEE80211_AMPDU_RX_START:

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,

			 ("IEEE80211_AMPDU_RX_START:TID:%d\n", tid));

			 "IEEE80211_AMPDU_RX_START:TID:%d\n", tid);

		break;

	case IEEE80211_AMPDU_RX_STOP:

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,

			 ("IEEE80211_AMPDU_RX_STOP:TID:%d\n", tid));

			 "IEEE80211_AMPDU_RX_STOP:TID:%d\n", tid);

		break;

	default:

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 ("IEEE80211_AMPDU_ERR!!!!:\n"));

			 "IEEE80211_AMPDU_ERR!!!!:\n");

		return -EOPNOTSUPP;

	}

	return 0;
@@ -867,7 +866,7 @@ static void rtl_op_sw_scan_start(struct ieee80211_hw *hw) 


	mac->act_scanning = true;



	RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, ("\n"));

	RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "\n");



	if (mac->link_state == MAC80211_LINKED) {

		rtl_lps_leave(hw);
@@ -888,7 +887,7 @@ static void rtl_op_sw_scan_complete(struct ieee80211_hw *hw) 
	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));



	RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, ("\n"));

	RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "\n");

	mac->act_scanning = false;

	/* Dual mac */

	rtlpriv->rtlhal.load_imrandiqk_setting_for2g = false;
@@ -921,13 +920,13 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 


	if (rtlpriv->cfg->mod_params->sw_crypto || rtlpriv->sec.use_sw_sec) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,

			 ("not open hw encryption\n"));

			 "not open hw encryption\n");

		return -ENOSPC;	/*User disabled HW-crypto */

	}

	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

		 ("%s hardware based encryption for keyidx: %d, mac: %pM\n",

		 "%s hardware based encryption for keyidx: %d, mac: %pM\n",

		 cmd == SET_KEY ? "Using" : "Disabling", key->keyidx,

		  sta ? sta->addr : bcast_addr));

		 sta ? sta->addr : bcast_addr);

	rtlpriv->sec.being_setkey = true;

	rtl_ips_nic_on(hw);

	mutex_lock(&rtlpriv->locks.conf_mutex);
@@ -936,24 +935,23 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
	switch (key->cipher) {

	case WLAN_CIPHER_SUITE_WEP40:

		key_type = WEP40_ENCRYPTION;

		RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, ("alg:WEP40\n"));

		RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "alg:WEP40\n");

		break;

	case WLAN_CIPHER_SUITE_WEP104:

		RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

			 ("alg:WEP104\n"));

		RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "alg:WEP104\n");

		key_type = WEP104_ENCRYPTION;

		break;

	case WLAN_CIPHER_SUITE_TKIP:

		key_type = TKIP_ENCRYPTION;

		RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, ("alg:TKIP\n"));

		RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "alg:TKIP\n");

		break;

	case WLAN_CIPHER_SUITE_CCMP:

		key_type = AESCCMP_ENCRYPTION;

		RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, ("alg:CCMP\n"));

		RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "alg:CCMP\n");

		break;

	default:

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 ("alg_err:%x!!!!:\n", key->cipher));

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "alg_err:%x!!!!\n",

			 key->cipher);

		goto out_unlock;

	}

	if (key_type == WEP40_ENCRYPTION ||
@@ -995,8 +993,8 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
				wep_only = true;

			rtlpriv->sec.pairwise_enc_algorithm = key_type;

			RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

				("set enable_hw_sec, key_type:%x(OPEN:0 WEP40:1"

				" TKIP:2 AES:4 WEP104:5)\n", key_type));

				 "set enable_hw_sec, key_type:%x(OPEN:0 WEP40:1 TKIP:2 AES:4 WEP104:5)\n",

				 key_type);

			rtlpriv->cfg->ops->enable_hw_sec(hw);

		}

	}
@@ -1005,7 +1003,7 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
	case SET_KEY:

		if (wep_only) {

			RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

				 ("set WEP(group/pairwise) key\n"));

				 "set WEP(group/pairwise) key\n");

			/* Pairwise key with an assigned MAC address. */

			rtlpriv->sec.pairwise_enc_algorithm = key_type;

			rtlpriv->sec.group_enc_algorithm = key_type;
@@ -1016,7 +1014,7 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
			memcpy(mac_addr, zero_addr, ETH_ALEN);

		} else if (group_key) {	/* group key */

			RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

				 ("set group key\n"));

				 "set group key\n");

			/* group key */

			rtlpriv->sec.group_enc_algorithm = key_type;

			/*set local buf about group key. */
@@ -1026,7 +1024,7 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
			memcpy(mac_addr, bcast_addr, ETH_ALEN);

		} else {	/* pairwise key */

			RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

				 ("set pairwise key\n"));

				 "set pairwise key\n");

			if (!sta) {

				RT_ASSERT(false, ("pairwise key withnot"

						  "mac_addr\n"));
@@ -1056,7 +1054,7 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
		break;

	case DISABLE_KEY:

		RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

			 ("disable key delete one entry\n"));

			 "disable key delete one entry\n");

		/*set local buf about wep key. */

		if (mac->opmode == NL80211_IFTYPE_AP) {

			if (sta)
@@ -1077,7 +1075,7 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
		break;

	default:

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 ("cmd_err:%x!!!!:\n", cmd));

			 "cmd_err:%x!!!!\n", cmd);

	}

out_unlock:

	mutex_unlock(&rtlpriv->locks.conf_mutex);
@@ -1106,8 +1104,8 @@ static void rtl_op_rfkill_poll(struct ieee80211_hw *hw) 
			rtlpriv->rfkill.rfkill_state = radio_state;



			RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,

				 (KERN_INFO "wireless radio switch turned %s\n",

				  radio_state ? "on" : "off"));

				 "wireless radio switch turned %s\n",

				 radio_state ? "on" : "off");



			blocked = (rtlpriv->rfkill.rfkill_state == 1) ? 0 : 1;

			wiphy_rfkill_set_hw_state(hw->wiphy, blocked);

drivers/net/wireless/rtlwifi/debug.h

+3 −4
Original line number Diff line number Diff line
@@ -165,14 +165,13 @@ do { \ 
	}								\

} while (0)



#define RT_TRACE(rtlpriv, comp, level, fmt)				\

#define RT_TRACE(rtlpriv, comp, level, fmt, ...)			\

do {									\

	if (unlikely(((comp) & rtlpriv->dbg.global_debugcomponents) &&	\

		     ((level) <= rtlpriv->dbg.global_debuglevel))) {	\

		printk(KERN_DEBUG "%s:%s():<%lx-%x> ",			\

		printk(KERN_DEBUG "%s:%s():<%lx-%x> " fmt,		\

		       KBUILD_MODNAME, __func__,			\

		       in_interrupt(), in_atomic());			\

		printk fmt;						\

		       in_interrupt(), in_atomic(), ##__VA_ARGS__);	\

	}								\

} while (0)

drivers/net/wireless/rtlwifi/efuse.c

+15 −16

File changed.

Preview size limit exceeded, changes collapsed.