diff options
author | Jiri Kosina <jkosina@suse.cz> | 2010-10-30 22:16:56 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-10-30 22:16:56 +0200 |
commit | f1e095f1d206b81b44160f41278ce5c78641e9b7 (patch) | |
tree | bd293d46d2d3e4cdf435a22ddb2877c6ba1b8acc /drivers/staging/rt2860/sta/rtmp_data.c | |
parent | telephony: fix return value (diff) | |
parent | Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify (diff) | |
download | linux-dev-f1e095f1d206b81b44160f41278ce5c78641e9b7.tar.xz linux-dev-f1e095f1d206b81b44160f41278ce5c78641e9b7.zip |
Merge branch 'master' into for-next
Diffstat (limited to 'drivers/staging/rt2860/sta/rtmp_data.c')
-rw-r--r-- | drivers/staging/rt2860/sta/rtmp_data.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/rt2860/sta/rtmp_data.c b/drivers/staging/rt2860/sta/rtmp_data.c index 5d348e9d9b79..23879b7cd49a 100644 --- a/drivers/staging/rt2860/sta/rtmp_data.c +++ b/drivers/staging/rt2860/sta/rtmp_data.c @@ -35,6 +35,7 @@ -------- ---------- ---------------------------------------------- */ #include "../rt_config.h" +#include <linux/kernel.h> void STARxEAPOLFrameIndicate(struct rt_rtmp_adapter *pAd, struct rt_mac_table_entry *pEntry, @@ -976,8 +977,8 @@ int STASendPacket(struct rt_rtmp_adapter *pAd, void *pPacket) if (!pEntry) { DBGPRINT(RT_DEBUG_ERROR, - ("STASendPacket->Cannot find pEntry(%2x:%2x:%2x:%2x:%2x:%2x) in MacTab!\n", - PRINT_MAC(pSrcBufVA))); + ("STASendPacket->Cannot find pEntry(%pM) in MacTab!\n", + pSrcBufVA)); /* Resourece is low, system did not allocate virtual address */ /* return NDIS_STATUS_FAILURE directly to upper layer */ RELEASE_NDIS_PACKET(pAd, pPacket, NDIS_STATUS_FAILURE); |