Commit 438812c3 authored by Larry Finger's avatar Larry Finger
Browse files

staging: rtl8192e: Remove MAC_FMT and MAC_ARG for %pM 



Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
parent 8bd890a4

drivers/staging/rtl8192e/rtl819x_BAProc.c

+7 −8
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ static struct sk_buff *rtllib_ADDBA(struct rtllib_device *ieee, u8 *Dst, 
	u16 tmp = 0;

	u16 len = ieee->tx_headroom + 9;

	RTLLIB_DEBUG(RTLLIB_DL_TRACE | RTLLIB_DL_BA, "========>%s(), frame(%d)"

		     " sentd to:"MAC_FMT", ieee->dev:%p\n", __func__,

		     type, MAC_ARG(Dst), ieee->dev);

		     " sentd to: %pM, ieee->dev:%p\n", __func__,

		     type, Dst, ieee->dev);

	if (pBA == NULL || ieee == NULL) {

		RTLLIB_DEBUG(RTLLIB_DL_ERR, "pBA(%p) is NULL or ieee(%p) is "

			     "NULL\n", pBA, ieee);
@@ -150,8 +150,8 @@ static struct sk_buff *rtllib_DELBA(struct rtllib_device *ieee, u8 *dst, 
	if (net_ratelimit())

		RTLLIB_DEBUG(RTLLIB_DL_TRACE | RTLLIB_DL_BA,

			     "========>%s(), Reason"

			     "Code(%d) sentd to:"MAC_FMT"\n", __func__,

			     ReasonCode, MAC_ARG(dst));

			     "Code(%d) sentd to: %pM\n", __func__,

			     ReasonCode, dst);



	memset(&DelbaParamSet, 0, 2);
@@ -265,7 +265,7 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb) 
	pBaTimeoutVal = (u16 *)(tag + 5);

	pBaStartSeqCtrl = (union sequence_control *)(req + 7);



	RT_TRACE(COMP_DBG, "====>rx ADDBAREQ from :"MAC_FMT"\n", MAC_ARG(dst));

	RT_TRACE(COMP_DBG, "====>rx ADDBAREQ from : %pM\n", dst);

	if (ieee->current_network.qos_data.active == 0  ||

	    (ieee->pHTInfo->bCurrentHTSupport == false) ||

	    (ieee->pHTInfo->IOTAction & HT_IOT_ACT_REJECT_ADDBA_REQ)) {
@@ -347,7 +347,7 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb) 
	pBaParamSet = (union ba_param_set *)(tag + 5);

	pBaTimeoutVal = (u16 *)(tag + 7);



	RT_TRACE(COMP_DBG, "====>rx ADDBARSP from :"MAC_FMT"\n", MAC_ARG(dst));

	RT_TRACE(COMP_DBG, "====>rx ADDBARSP from : %pM\n", dst);

	if (ieee->current_network.qos_data.active == 0  ||

	    ieee->pHTInfo->bCurrentHTSupport == false ||

	    ieee->pHTInfo->bCurrentAMPDUEnable == false) {
@@ -459,8 +459,7 @@ int rtllib_rx_DELBA(struct rtllib_device *ieee, struct sk_buff *skb) 
		if (!GetTs(ieee, (struct ts_common_info **)&pRxTs, dst,

		    (u8)pDelBaParamSet->field.TID, RX_DIR, false)) {

			RTLLIB_DEBUG(RTLLIB_DL_ERR,  "can't get TS for RXTS in "

				     "%s().dst:"MAC_FMT" TID:%d\n", __func__,

				     MAC_ARG(dst),

				     "%s().dst: %pM TID:%d\n", __func__, dst,

				     (u8)pDelBaParamSet->field.TID);

			return -1;

		}

drivers/staging/rtl8192e/rtl819x_TSProc.c

+3 −3
Original line number Diff line number Diff line
@@ -389,9 +389,9 @@ bool GetTs(struct rtllib_device *ieee, struct ts_common_info **ppTS, 
				}



				RTLLIB_DEBUG(RTLLIB_DL_TS, "to init current TS"

					     ", UP:%d, Dir:%d, addr:"MAC_FMT

					     ", UP:%d, Dir:%d, addr: %pM"

					     " ppTs=%p\n", UP, Dir,

					      MAC_ARG(Addr), *ppTS);

					      Addr, *ppTS);

				pTSInfo->field.ucTrafficType = 0;

				pTSInfo->field.ucTSID = UP;

				pTSInfo->field.ucDirection = Dir;
@@ -462,7 +462,7 @@ void RemoveTsEntry(struct rtllib_device *ieee, struct ts_common_info *pTs, 
void RemovePeerTS(struct rtllib_device *ieee, u8 *Addr)

{

	struct ts_common_info *pTS, *pTmpTS;

	printk(KERN_INFO "===========>RemovePeerTS,"MAC_FMT"\n", MAC_ARG(Addr));

	printk(KERN_INFO "===========>RemovePeerTS, %pM\n", Addr);



	list_for_each_entry_safe(pTS, pTmpTS, &ieee->Tx_TS_Pending_List, List) {

		if (memcmp(pTS->Addr, Addr, 6) == 0) {

drivers/staging/rtl8192e/rtl_cam.c

+2 −2
Original line number Diff line number Diff line
@@ -126,8 +126,8 @@ void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType, 
		RT_TRACE(COMP_ERR, "cam entry exceeds in setKey()\n");



	RT_TRACE(COMP_SEC, "====>to setKey(), dev:%p, EntryNo:%d, KeyIndex:%d,"

		 "KeyType:%d, MacAddr"MAC_FMT"\n", dev, EntryNo, KeyIndex,

		 KeyType, MAC_ARG(MacAddr));

		 "KeyType:%d, MacAddr %pM\n", dev, EntryNo, KeyIndex,

		 KeyType, MacAddr);



	if (DefaultKey)

		usConfig |= BIT15 | (KeyType<<2);

drivers/staging/rtl8192e/rtl_dm.c

+2 −2
Original line number Diff line number Diff line
@@ -2322,9 +2322,9 @@ static void dm_check_edca_turbo(struct net_device *dev) 
		static int wb_tmp;

		if (wb_tmp == 0) {

			printk(KERN_INFO "%s():iot peer is %s, bssid:"

			       MAC_FMT"\n", __func__,

			       " %pM\n", __func__,

			       peername[pHTInfo->IOTPeer],

			       MAC_ARG(priv->rtllib->current_network.bssid));

			       priv->rtllib->current_network.bssid);

			wb_tmp = 1;

		}

	}

drivers/staging/rtl8192e/rtllib.h

+0 −4
Original line number Diff line number Diff line
@@ -700,10 +700,6 @@ do { \ 
		}					\

	} 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]



/*

 * To use the debug system;

 *