From f682e96f720d9fbd7aada981f8b8e35777e4695b Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Sun, 15 Jan 2012 00:38:43 -0800
Subject: [PATCH] --- yaml --- r: 289966 b: refs/heads/master c:
 c2e6d5abab73df316d2ae7caa6d902c143b2d52d h: refs/heads/master v: v3

---
 [refs]                                               | 2 +-
 trunk/drivers/net/wireless/brcm80211/brcmsmac/main.c | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 2640e576b765..2e60b10cfb38 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18aad4f8e11530fd7e41d0faea0752c3a0ce799c
+refs/heads/master: c2e6d5abab73df316d2ae7caa6d902c143b2d52d
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmsmac/main.c b/trunk/drivers/net/wireless/brcm80211/brcmsmac/main.c
index 14ab606de745..72701a4bf89d 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/trunk/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -5858,9 +5858,8 @@ void brcms_c_print_txdesc(struct d11txh *txh)
 	struct ieee80211_rts rts = txh->rts_frame;
 
 	/* add plcp header along with txh descriptor */
-	pr_debug("Raw TxDesc + plcp header:\n");
-	print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
-			     txh, sizeof(struct d11txh) + 48);
+	brcmu_dbg_hex_dump(txh, sizeof(struct d11txh) + 48,
+			   "Raw TxDesc + plcp header:\n");
 
 	pr_debug("TxCtlLow: %04x ", mtcl);
 	pr_debug("TxCtlHigh: %04x ", mtch);
@@ -5986,9 +5985,7 @@ void brcms_c_print_rxh(struct d11rxhdr *rxh)
 		{0, NULL}
 	};
 
-	pr_debug("Raw RxDesc:\n");
-	print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, rxh,
-			     sizeof(struct d11rxhdr));
+	brcmu_dbg_hex_dump(rxh, sizeof(struct d11rxhdr), "Raw RxDesc:\n");
 
 	brcms_c_format_flags(macstat_flags, macstatus1, flagstr, 64);