include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[net-next-2.6.git] / drivers / staging / rtl8192su / ieee80211 / rtl819x_TSProc.c

diff --git a/drivers/staging/rtl8192su/ieee80211/rtl819x_TSProc.c b/drivers/staging/rtl8192su/ieee80211/rtl819x_TSProc.c
index ad3bf35d80e661f6991ec99a61891c0536e98727..38468c53967506a2a7f2b306613084dba9785406 100644 (file)
--- a/drivers/staging/rtl8192su/ieee80211/rtl819x_TSProc.c
+++ b/drivers/staging/rtl8192su/ieee80211/rtl819x_TSProc.c
@@ -1,5 +1,6 @@
 #include "ieee80211.h"
 #include <linux/etherdevice.h>
+#include <linux/slab.h>
 #include "rtl819x_TS.h"
 
 void TsSetupTimeOut(unsigned long data)
@@ -291,7 +292,7 @@ PTS_COMMON_INFO SearchAdmitTRStream(struct ieee80211_device *ieee, u8*      Addr, u8
                if(search_dir[dir] ==false )
                        continue;
                list_for_each_entry(pRet, psearch_list, List){
-       //              IEEE80211_DEBUG(IEEE80211_DL_TS, "ADD:"MAC_FMT", TID:%d, dir:%d\n", MAC_ARG(pRet->Addr), pRet->TSpec.f.TSInfo.field.ucTSID, pRet->TSpec.f.TSInfo.field.ucDirection);
+       //              IEEE80211_DEBUG(IEEE80211_DL_TS, "ADD:%pM, TID:%d, dir:%d\n", pRet->Addr, pRet->TSpec.f.TSInfo.field.ucTSID, pRet->TSpec.f.TSInfo.field.ucDirection);
                        if (memcmp(pRet->Addr, Addr, 6) == 0)
                                if (pRet->TSpec.f.TSInfo.field.ucTSID == TID)
                                        if(pRet->TSpec.f.TSInfo.field.ucDirection == dir)
@@ -447,7 +448,7 @@ bool GetTs(
                                        ResetRxTsEntry(tmp);
                                }
 
-                               IEEE80211_DEBUG(IEEE80211_DL_TS, "to init current TS, UP:%d, Dir:%d, addr:"MAC_FMT"\n", UP, Dir, MAC_ARG(Addr));
+                               IEEE80211_DEBUG(IEEE80211_DL_TS, "to init current TS, UP:%d, Dir:%d, addr:%pM\n", UP, Dir, Addr);
                                // Prepare TS Info releated field
                                pTSInfo->field.ucTrafficType = 0;                       // Traffic type: WMM is reserved in this field
                                pTSInfo->field.ucTSID = UP;                     // TSID
@@ -533,7 +534,7 @@ void RemoveTsEntry(
 void RemovePeerTS(struct ieee80211_device* ieee, u8* Addr)
 {
        PTS_COMMON_INFO pTS, pTmpTS;
-       printk("===========>RemovePeerTS,"MAC_FMT"\n", MAC_ARG(Addr));
+       printk("===========>RemovePeerTS,%pM\n", Addr);
 #if 1
        list_for_each_entry_safe(pTS, pTmpTS, &ieee->Tx_TS_Pending_List, List)
        {