Commit cb418e57 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192ee: Fix RT_TRACE #define and uses 



RT_TRACE uses require unnecessary parentheses.

Fix the #define and remove the uses.

Neaten the RT_TRACE lines and multi-line argument wrapping.

dynamic debug can add KBUILD_MODNAME and __func__ so remove those
from the #define.

Use a single statement pr_debug instead of pr_debug and pr_cont
which doesn't support dynamic debug anyway.

Miscellaneous grammar and spelling fixes on the RT_TRACE uses.

Compile tested only.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 63d29d51

drivers/staging/rtl8192ee/base.c

+36 −40
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ static void _rtl_init_hw_ht_capab(struct ieee80211_hw *hw, 
	 *highest supported RX rate

	 */

	if (rtlpriv->dm.supp_phymode_switch) {

		RT_TRACE(COMP_INIT, DBG_EMERG, ("Support phy mode switch\n"));

		RT_TRACE(COMP_INIT, DBG_EMERG, "Support phy mode switch\n");



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

		ht_cap->mcs.rx_mask[1] = 0xFF;
@@ -216,7 +216,7 @@ static void _rtl_init_hw_ht_capab(struct ieee80211_hw *hw, 
	} else {

		if (get_rf_type(rtlphy) == RF_1T2R ||

		    get_rf_type(rtlphy) == RF_2T2R) {

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

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



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

			ht_cap->mcs.rx_mask[1] = 0xFF;
@@ -224,7 +224,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(COMP_INIT, DBG_DMESG, ("1T1R\n"));

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



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

			ht_cap->mcs.rx_mask[1] = 0x00;
@@ -388,7 +388,7 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw) 
			hw->wiphy->bands[IEEE80211_BAND_5GHZ] = sband;

		} else {

			RT_TRACE(COMP_INIT, DBG_EMERG,

				 ("Err BAND %d\n", rtlhal->current_bandtype));

				 "Err BAND %d\n", rtlhal->current_bandtype);

		}

	}

	/* <5> set hw caps */
@@ -556,7 +556,7 @@ int rtl92e_init_core(struct ieee80211_hw *hw) 
	 * mac80211 hw  in _rtl_init_mac80211.

	 */

	if (rtl92e_regd_init(hw, rtl92e_reg_notifier)) {

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

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

		return 1;

	}
@@ -952,7 +952,7 @@ bool rtl92e_tx_mgmt_proc(struct ieee80211_hw *hw, struct sk_buff *skb) 
			rtlpriv->cfg->ops->check_switch_to_dmdp(hw);

	}

	if (ieee80211_is_auth(fc)) {

		RT_TRACE(COMP_SEND, DBG_DMESG, ("MAC80211_LINKING\n"));

		RT_TRACE(COMP_SEND, DBG_DMESG, "MAC80211_LINKING\n");

		rtl92e_ips_nic_on(hw);



		mac->link_state = MAC80211_LINKING;
@@ -987,8 +987,8 @@ bool rtl92e_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx) 
				return false;



			RT_TRACE((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);

			RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, "req\n",

				      skb->data, skb->len);

			if (!is_tx) {
@@ -1004,7 +1004,7 @@ bool rtl92e_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx) 
				sta = rtl_find_sta(hw, hdr->addr3);

				if (sta == NULL) {

					RT_TRACE((COMP_SEND | COMP_RECV),

						 DBG_TRACE, ("sta is NULL\n"));

						 DBG_TRACE, "sta is NULL\n");

					rcu_read_unlock();

					return true;

				}
@@ -1047,12 +1047,12 @@ bool rtl92e_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx) 
			break;

		case ACT_ADDBARSP:

			RT_TRACE((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((COMP_SEND | COMP_RECV), DBG_DMESG,

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

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

			break;

		}

		break;
@@ -1094,9 +1094,8 @@ u8 rtl92e_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, 
				 * 68 : UDP BOOTP client

				 * 67 : UDP BOOTP server

				 */

				RT_TRACE((COMP_SEND | COMP_RECV),

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

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

				RT_TRACE((COMP_SEND | COMP_RECV), DBG_DMESG,

					 "dhcp %s !!\n", is_tx ? "Tx" : "Rx");



				if (is_tx) {

					rtlpriv->ra.is_special_data = true;
@@ -1124,7 +1123,7 @@ u8 rtl92e_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, 
		return true;

	} else if (ETH_P_PAE == ether_type) {

		RT_TRACE((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) {

			rtlpriv->ra.is_special_data = true;
@@ -1165,9 +1164,8 @@ int rtl92e_tx_agg_start(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
		return -ENXIO;

	tid_data = &sta_entry->tids[tid];



	RT_TRACE(COMP_SEND, DBG_DMESG,

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

		  tid_data->seq_number));

	RT_TRACE(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;
@@ -1188,12 +1186,12 @@ int rtl92e_tx_agg_stop(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 


	/* Comparing an array to null is not useful */

	/*if (!sta->addr) {

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

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

		return -EINVAL;

	}*/



	RT_TRACE(COMP_SEND, DBG_DMESG,

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

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

		 sta->addr, tid);



	if (unlikely(tid >= MAX_TID_COUNT))

		return -EINVAL;
@@ -1224,9 +1222,8 @@ int rtl92e_rx_agg_start(struct ieee80211_hw *hw, 
		return -ENXIO;

	tid_data = &sta_entry->tids[tid];



	RT_TRACE(COMP_RECV, DBG_DMESG,

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

		 tid_data->seq_number));

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

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



	tid_data->agg.rx_agg_state = RTL_RX_AGG_START;

	return 0;
@@ -1244,12 +1241,12 @@ int rtl92e_rx_agg_stop(struct ieee80211_hw *hw, 


	/* Comparing an array to null is not useful */

	/*if (!sta->addr) {

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

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

		return -EINVAL;

	}*/



	RT_TRACE(COMP_SEND, DBG_DMESG,

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

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

		 sta->addr, tid);



	if (unlikely(tid >= MAX_TID_COUNT))

		return -EINVAL;
@@ -1273,12 +1270,12 @@ int rtl92e_tx_agg_oper(struct ieee80211_hw *hw, 


	/* Comparing an array to null is not useful */

	/*if (!sta->addr) {

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

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

		return -EINVAL;

	}*/



	RT_TRACE(COMP_SEND, DBG_DMESG,

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

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

		 sta->addr, tid);



	if (unlikely(tid >= MAX_TID_COUNT))

		return -EINVAL;
@@ -1454,15 +1451,14 @@ void rtl92e_watchdog_wq_callback(void *data) 
		if ((rtlpriv->link_info.bcn_rx_inperiod +

			rtlpriv->link_info.num_rx_inperiod) == 0) {

			rtlpriv->link_info.roam_times++;

			RT_TRACE(COMP_ERR, DBG_DMESG,

				 ("AP off for %d s\n",

				  (rtlpriv->link_info.roam_times * 2)));

			RT_TRACE(COMP_ERR, DBG_DMESG, "AP off for %d s\n",

				 rtlpriv->link_info.roam_times * 2);



			/* if we can't recv beacon for 10s,

			* we should reconnect this AP */

			if (rtlpriv->link_info.roam_times >= 5) {

				RT_TRACE(COMP_ERR, DBG_EMERG,

					 ("AP off, try to reconnect now\n"));

					 "AP off, try to reconnect now\n");

				rtlpriv->link_info.roam_times = 0;

				ieee80211_connection_loss(

					rtlpriv->mac80211.vif);
@@ -1793,29 +1789,29 @@ void rtl92e_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(COMP_MAC80211, DBG_LOUD, ("=>ath find\n"));

		RT_TRACE(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(COMP_MAC80211, DBG_LOUD, ("=>ral findn\n"));

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

		vendor = PEER_RAL;

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

		vendor == PEER_CISCO) {

		vendor = PEER_CISCO;

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

		RT_TRACE(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(COMP_MAC80211, DBG_LOUD, ("=>broad find\n"));

		RT_TRACE(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(COMP_MAC80211, DBG_LOUD, ("=>marv find\n"));

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

	}



	mac->vendor = vendor;

drivers/staging/rtl8192ee/btcoexist/rtl_btc.c

+3 −6
Original line number Diff line number Diff line
@@ -57,17 +57,14 @@ void rtl92e_btc_init_hal_vars(struct rtl_priv *rtlpriv) 
	u8 bt_exist;

	u8 bt_type;

	ant_num = rtl92e_get_hwpg_ant_num(rtlpriv);

	RT_TRACE(COMP_INIT, DBG_DMESG,

		 ("%s, antNum is %d\n", __func__, ant_num));

	RT_TRACE(COMP_INIT, DBG_DMESG, "antNum is %d\n", ant_num);



	bt_exist = rtl92e_get_hwpg_bt_exist(rtlpriv);

	RT_TRACE(COMP_INIT, DBG_DMESG,

		 ("%s, bt_exist is %d\n", __func__, bt_exist));

	RT_TRACE(COMP_INIT, DBG_DMESG, "bt_exist is %d\n", bt_exist);

	exhalbtc92e_set_bt_exist(bt_exist);



	bt_type = rtl92e_get_hwpg_bt_type(rtlpriv);

	RT_TRACE(COMP_INIT, DBG_DMESG,

		 ("%s, bt_type is %d\n", __func__, bt_type));

	RT_TRACE(COMP_INIT, DBG_DMESG, "bt_type is %d\n", bt_type);

	exhalbtc92e_set_chip_type(bt_type);



	exhalbtc92e_set_ant_num(BT_COEX_ANT_TYPE_PG, ant_num);

drivers/staging/rtl8192ee/cam.c

+34 −41
Original line number Diff line number Diff line
@@ -62,14 +62,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(COMP_SEC, DBG_LOUD,

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

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

			RT_TRACE(COMP_SEC, DBG_LOUD,

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

			RT_TRACE(COMP_SEC, DBG_LOUD,

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

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

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

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

			RT_TRACE(COMP_SEC, DBG_LOUD, "The Key ID is %d\n",

				 entry_no);

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

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

		} else if (entry_i == 1) {

			target_content = (u32) (*(mac_addr + 5)) << 24 |

			    (u32) (*(mac_addr + 4)) << 16 |
@@ -81,10 +79,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(COMP_SEC, DBG_LOUD,

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

			RT_TRACE(COMP_SEC, DBG_LOUD,

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

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

				 target_content);

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

				 target_command);

		} else {

			target_content =

			    (u32) (*(key_cont_128 + (entry_i * 4 - 8) + 3)) <<
@@ -99,15 +97,14 @@ static void rtl_cam_program_entry(struct ieee80211_hw *hw, u32 entry_no, 
					target_command);

			udelay(100);



			RT_TRACE(COMP_SEC, DBG_LOUD,

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

			RT_TRACE(COMP_SEC, DBG_LOUD,

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

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

				 target_content);

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

				 target_command);

		}

	}



	RT_TRACE(COMP_SEC, DBG_LOUD,

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

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

}



u8 stg_rtl_cam_add_one_entry(struct ieee80211_hw *hw, u8 *mac_addr,
@@ -118,13 +115,11 @@ u8 stg_rtl_cam_add_one_entry(struct ieee80211_hw *hw, u8 *mac_addr, 
	struct rtl_priv *rtlpriv = rtl_priv(hw);



	RT_TRACE(COMP_SEC, DBG_DMESG,

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

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



	if (ul_key_id == TOTAL_CAM_ENTRY) {

		RT_TRACE(COMP_ERR, DBG_WARNING,

			 ("ulKeyId exceed!\n"));

		RT_TRACE(COMP_ERR, DBG_WARNING, "ulKeyId exceed!\n");

		return 0;

	}
@@ -136,7 +131,7 @@ u8 stg_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(COMP_SEC, DBG_DMESG, ("end\n"));

	RT_TRACE(COMP_SEC, DBG_DMESG, "end\n");



	return 1;

}
@@ -148,7 +143,7 @@ int stg_rtl_cam_delete_one_entry(struct ieee80211_hw *hw, 
	u32 ul_command;

	struct rtl_priv *rtlpriv = rtl_priv(hw);



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

	RT_TRACE(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);
@@ -157,10 +152,10 @@ int stg_rtl_cam_delete_one_entry(struct ieee80211_hw *hw, 
	rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM], ul_command);



	RT_TRACE(COMP_SEC, DBG_DMESG,

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

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

	RT_TRACE(COMP_SEC, DBG_DMESG,

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

		  ul_command));

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

		 ul_command);

	return 0;

}

EXPORT_SYMBOL(stg_rtl_cam_delete_one_entry);
@@ -210,9 +205,9 @@ void stg_rtl_cam_mark_invalid(struct ieee80211_hw *hw, u8 uc_index) 
	rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM], ul_command);



	RT_TRACE(COMP_SEC, DBG_DMESG,

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

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

	RT_TRACE(COMP_SEC, DBG_DMESG,

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

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

}

EXPORT_SYMBOL(stg_rtl_cam_mark_invalid);
@@ -259,11 +254,11 @@ void stg_rtl_cam_empty_entry(struct ieee80211_hw *hw, u8 uc_index) 
		rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM], ul_command);



		RT_TRACE(COMP_SEC, DBG_LOUD,

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

			  ul_content));

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

			  ul_content);

		RT_TRACE(COMP_SEC, DBG_LOUD,

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

			  ul_command));

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

			 ul_command);

	}

}

EXPORT_SYMBOL(stg_rtl_cam_empty_entry);
@@ -276,8 +271,7 @@ u8 stg_rtl_cam_get_free_entry(struct ieee80211_hw *hw, u8 *sta_addr) 
	u8 i, *addr;



	if (!sta_addr) {

		RT_TRACE(COMP_SEC, DBG_EMERG,

			 ("sta_addr is NULL\n"));

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

		return TOTAL_CAM_ENTRY;

	}

	/* Does STA already exist? */
@@ -290,8 +284,8 @@ u8 stg_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(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);
@@ -310,14 +304,13 @@ void stg_rtl_cam_del_entry(struct ieee80211_hw *hw, u8 *sta_addr) 
	u8 i, *addr;



	if (NULL == sta_addr) {

		RT_TRACE(COMP_SEC, DBG_EMERG,

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

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

		return;

	}



	if (is_zero_ether_addr(sta_addr)) {

		RT_TRACE(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/staging/rtl8192ee/core.c

+71 −83

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/rtl8192ee/debug.c

+44 −44
Original line number Diff line number Diff line
@@ -779,9 +779,9 @@ void rtl_proc_add_one(struct ieee80211_hw *hw) 
	rtlpriv->dbg.proc_dir = proc_mkdir(rtlpriv->dbg.proc_name, proc_topdir);

	if (!rtlpriv->dbg.proc_dir) {

		RT_TRACE(COMP_INIT, DBG_EMERG,

			 ("Unable to init /proc/net/%s/%s\n",

			 "Unable to init /proc/net/%s/%s\n",

			  rtlpriv->cfg->name,

			  rtlpriv->dbg.proc_name));

			  rtlpriv->dbg.proc_name);

		return;

	}
@@ -789,148 +789,148 @@ void rtl_proc_add_one(struct ieee80211_hw *hw) 
				 rtlpriv->dbg.proc_dir, &file_ops_mac_0, hw);

	if (!entry)

		RT_TRACE(COMP_INIT, DBG_EMERG,

			 ("Unable to initialize /proc/net/%s/%s/mac-0\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name));

			 "Unable to initialize /proc/net/%s/%s/mac-0\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name);



	entry = proc_create_data("mac-1", S_IFREG | S_IRUGO,

				 rtlpriv->dbg.proc_dir, &file_ops_mac_1, hw);

	if (!entry)

		RT_TRACE(COMP_INIT, COMP_ERR,

			 ("Unable to initialize /proc/net/%s/%s/mac-1\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name));

			 "Unable to initialize /proc/net/%s/%s/mac-1\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name);



	entry = proc_create_data("mac-2", S_IFREG | S_IRUGO,

				 rtlpriv->dbg.proc_dir, &file_ops_mac_2, hw);

	if (!entry)

		RT_TRACE(COMP_INIT, COMP_ERR,

			 ("Unable to initialize /proc/net/%s/%s/mac-2\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name));

			 "Unable to initialize /proc/net/%s/%s/mac-2\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name);



	entry = proc_create_data("mac-3", S_IFREG | S_IRUGO,

				 rtlpriv->dbg.proc_dir, &file_ops_mac_3, hw);

	if (!entry)

		RT_TRACE(COMP_INIT, COMP_ERR,

			 ("Unable to initialize /proc/net/%s/%s/mac-3\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name));

			 "Unable to initialize /proc/net/%s/%s/mac-3\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name);



	entry = proc_create_data("mac-4", S_IFREG | S_IRUGO,

				 rtlpriv->dbg.proc_dir, &file_ops_mac_4, hw);

	if (!entry)

		RT_TRACE(COMP_INIT, COMP_ERR,

			 ("Unable to initialize /proc/net/%s/%s/mac-4\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name));

			 "Unable to initialize /proc/net/%s/%s/mac-4\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name);



	entry = proc_create_data("mac-5", S_IFREG | S_IRUGO,

				 rtlpriv->dbg.proc_dir, &file_ops_mac_5, hw);

	if (!entry)

		RT_TRACE(COMP_INIT, COMP_ERR,

			 ("Unable to initialize /proc/net/%s/%s/mac-5\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name));

			 "Unable to initialize /proc/net/%s/%s/mac-5\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name);



	entry = proc_create_data("mac-6", S_IFREG | S_IRUGO,

				 rtlpriv->dbg.proc_dir, &file_ops_mac_6, hw);

	if (!entry)

		RT_TRACE(COMP_INIT, COMP_ERR,

			 ("Unable to initialize /proc/net/%s/%s/mac-6\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name));

			 "Unable to initialize /proc/net/%s/%s/mac-6\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name);



	entry = proc_create_data("mac-7", S_IFREG | S_IRUGO,

				 rtlpriv->dbg.proc_dir, &file_ops_mac_7, hw);

	if (!entry)

		RT_TRACE(COMP_INIT, COMP_ERR,

			 ("Unable to initialize /proc/net/%s/%s/mac-7\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name));

			 "Unable to initialize /proc/net/%s/%s/mac-7\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name);



	entry = proc_create_data("bb-8", S_IFREG | S_IRUGO,

				 rtlpriv->dbg.proc_dir, &file_ops_bb_8, hw);

	if (!entry)

		RT_TRACE(COMP_INIT, COMP_ERR,

			 ("Unable to initialize /proc/net/%s/%s/bb-8\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name));

			 "Unable to initialize /proc/net/%s/%s/bb-8\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name);



	entry = proc_create_data("bb-9", S_IFREG | S_IRUGO,

				 rtlpriv->dbg.proc_dir, &file_ops_bb_9, hw);

	if (!entry)

		RT_TRACE(COMP_INIT, COMP_ERR,

			 ("Unable to initialize /proc/net/%s/%s/bb-9\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name));

			 "Unable to initialize /proc/net/%s/%s/bb-9\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name);



	entry = proc_create_data("bb-a", S_IFREG | S_IRUGO,

				 rtlpriv->dbg.proc_dir, &file_ops_bb_a, hw);

	if (!entry)

		RT_TRACE(COMP_INIT, COMP_ERR,

			 ("Unable to initialize /proc/net/%s/%s/bb-a\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name));

			 "Unable to initialize /proc/net/%s/%s/bb-a\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name);



	entry = proc_create_data("bb-b", S_IFREG | S_IRUGO,

				 rtlpriv->dbg.proc_dir, &file_ops_bb_b, hw);

	if (!entry)

		RT_TRACE(COMP_INIT, COMP_ERR,

			 ("Unable to initialize /proc/net/%s/%s/bb-b\n",

		      rtlpriv->cfg->name, rtlpriv->dbg.proc_name));

			 "Unable to initialize /proc/net/%s/%s/bb-b\n",

		      rtlpriv->cfg->name, rtlpriv->dbg.proc_name);



	entry = proc_create_data("bb-c", S_IFREG | S_IRUGO,

				 rtlpriv->dbg.proc_dir, &file_ops_bb_c, hw);

	if (!entry)

		RT_TRACE(COMP_INIT, COMP_ERR,

			 ("Unable to initialize /proc/net/%s/%s/bb-c\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name));

			 "Unable to initialize /proc/net/%s/%s/bb-c\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name);



	entry = proc_create_data("bb-d", S_IFREG | S_IRUGO,

				 rtlpriv->dbg.proc_dir, &file_ops_bb_d, hw);

	if (!entry)

		RT_TRACE(COMP_INIT, COMP_ERR,

			 ("Unable to initialize /proc/net/%s/%s/bb-d\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name));

			 "Unable to initialize /proc/net/%s/%s/bb-d\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name);



	entry = proc_create_data("bb-e", S_IFREG | S_IRUGO,

				 rtlpriv->dbg.proc_dir, &file_ops_bb_e, hw);

	if (!entry)

		RT_TRACE(COMP_INIT, COMP_ERR,

			 ("Unable to initialize /proc/net/%s/%s/bb-e\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name));

			 "Unable to initialize /proc/net/%s/%s/bb-e\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name);



	entry = proc_create_data("bb-f", S_IFREG | S_IRUGO,

				 rtlpriv->dbg.proc_dir, &file_ops_bb_f, hw);

	if (!entry)

		RT_TRACE(COMP_INIT, COMP_ERR,

			 ("Unable to initialize /proc/net/%s/%s/bb-f\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name));

			 "Unable to initialize /proc/net/%s/%s/bb-f\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name);



	entry = proc_create_data("rf-a", S_IFREG | S_IRUGO,

				 rtlpriv->dbg.proc_dir, &file_ops_rf_a, hw);

	if (!entry)

		RT_TRACE(COMP_INIT, COMP_ERR,

			 ("Unable to initialize /proc/net/%s/%s/rf-a\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name));

			 "Unable to initialize /proc/net/%s/%s/rf-a\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name);



	entry = proc_create_data("rf-b", S_IFREG | S_IRUGO,

				 rtlpriv->dbg.proc_dir, &file_ops_rf_b, hw);

	if (!entry)

		RT_TRACE(COMP_INIT, COMP_ERR,

			 ("Unable to initialize /proc/net/%s/%s/rf-b\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name));

			 "Unable to initialize /proc/net/%s/%s/rf-b\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name);



	entry = proc_create_data("cam-1", S_IFREG | S_IRUGO,

				 rtlpriv->dbg.proc_dir, &file_ops_cam_1, hw);

	if (!entry)

		RT_TRACE(COMP_INIT, COMP_ERR,

			 ("Unable to initialize /proc/net/%s/%s/cam-1\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name));

			 "Unable to initialize /proc/net/%s/%s/cam-1\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name);



	entry = proc_create_data("cam-2", S_IFREG | S_IRUGO,

				 rtlpriv->dbg.proc_dir, &file_ops_cam_2, hw);

	if (!entry)

		RT_TRACE(COMP_INIT, COMP_ERR,

			 ("Unable to initialize /proc/net/%s/%s/cam-2\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name));

			 "Unable to initialize /proc/net/%s/%s/cam-2\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name);



	entry = proc_create_data("cam-3", S_IFREG | S_IRUGO,

				 rtlpriv->dbg.proc_dir, &file_ops_cam_3, hw);

	if (!entry)

		RT_TRACE(COMP_INIT, COMP_ERR,

			 ("Unable to initialize /proc/net/%s/%s/cam-3\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name));

			 "Unable to initialize /proc/net/%s/%s/cam-3\n",

			  rtlpriv->cfg->name, rtlpriv->dbg.proc_name);

}



void rtl_proc_remove_one(struct ieee80211_hw *hw)