From bd5b9c42531d8b2415aa2fae85c3186407aada7d Mon Sep 17 00:00:00 2001
From: Roland Vossen <rvossen@broadcom.com>
Date: Tue, 3 May 2011 11:36:00 +0200
Subject: [PATCH] --- yaml --- r: 249343 b: refs/heads/master c:
 e0c6bf1315656a8bb1be095b6e43dcef1b1074a7 h: refs/heads/master i:   249341:
 c9cb9e40ea1dba9a81322de8dbd1b9c2022baaf6   249339:
 250b22d342b240b602287e54f40c39115c0eb4d8   249335:
 6b6a7efdf98043fa0deef254777ea5f26248e312   249327:
 583a5b3ede2d8f1424359dcee573dbbf3d202f4e   249311:
 e01c5993830dd31f2a65207105d2c6d558154ecb   249279:
 7f770ce5db335b627aaeb8a0f0ad81f45a6c7ea1   249215:
 ab318719ddc973dcece2c80aed5afe9a3de6ca07   249087:
 c9f126e41a2f2ff25a74cc65594f37964bb00510   248831:
 9b1fade141dab63225fb3d45078dd77e175fdfef v: v3

---
 [refs]                                              |  2 +-
 trunk/drivers/staging/brcm80211/brcmsmac/wl_dbg.h   |  8 --------
 .../drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c  | 13 ++++++-------
 trunk/drivers/staging/brcm80211/include/wlioctl.h   |  2 --
 4 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index 6bdcec565328..4d459c7826dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 222508d78ff484cac34109c5cf2e936e40e82c28
+refs/heads/master: e0c6bf1315656a8bb1be095b6e43dcef1b1074a7
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wl_dbg.h b/trunk/drivers/staging/brcm80211/brcmsmac/wl_dbg.h
index 8beeefe30d4e..5582de3ee721 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/wl_dbg.h
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/wl_dbg.h
@@ -22,12 +22,6 @@
 /* wl_msg_level is a bit vector with defs in wlioctl.h */
 extern u32 wl_msg_level;
 
-#define WL_PRINT(level, fmt, args...)		\
-do {						\
-	if (wl_msg_level & level)		\
-		printk(fmt, ##args);		\
-} while (0)
-
 #define BCMMSG(dev, fmt, args...)		\
 do {						\
 	if (wl_msg_level & WL_TRACE_VAL)	\
@@ -36,7 +30,6 @@ do {						\
 
 #ifdef BCMDBG
 
-#define WL_FFPLD(fmt, args...)	WL_PRINT(WL_FFPLD_VAL, fmt, ##args)
 
 /* Extra message control for AMPDU debugging */
 #define   WL_AMPDU_UPDN_VAL	0x00000001	/* Config up/down related  */
@@ -79,7 +72,6 @@ do {						\
 
 #else				/* BCMDBG */
 
-#define WL_FFPLD(fmt, args...)		no_printk(fmt, ##args)
 
 #define WL_AMPDU_UPDN(fmt, args...)	no_printk(fmt, ##args)
 #define WL_AMPDU_RX(fmt, args...)	no_printk(fmt, ##args)
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
index dbdbe854bcd3..876e52347004 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
@@ -314,7 +314,7 @@ static int wlc_ffpld_check_txfunfl(struct wlc_info *wlc, int fid)
 			 M_UCODE_MACSTAT + offsetof(macstat_t, txfunfl[fid]));
 	new_txunfl = (u16) (cur_txunfl - fifo->prev_txfunfl);
 	if (new_txunfl == 0) {
-		WL_FFPLD("check_txunfl : TX status FRAG set but no tx underflows\n");
+		BCMMSG(wlc->wiphy, "TX status FRAG set but no tx underflows\n");
 		return -1;
 	}
 	fifo->prev_txfunfl = cur_txunfl;
@@ -324,7 +324,6 @@ static int wlc_ffpld_check_txfunfl(struct wlc_info *wlc, int fid)
 
 	/* check if fifo is big enough */
 	if (wlc_xmtfifo_sz_get(wlc, fid, &xmtfifo_sz)) {
-		WL_FFPLD("check_txunfl : get xmtfifo_sz failed\n");
 		return -1;
 	}
 
@@ -338,8 +337,8 @@ static int wlc_ffpld_check_txfunfl(struct wlc_info *wlc, int fid)
 	if (fifo->accum_txfunfl < 10)
 		return 0;
 
-	WL_FFPLD("ampdu_count %d  tx_underflows %d\n",
-		 current_ampdu_cnt, fifo->accum_txfunfl);
+	BCMMSG(wlc->wiphy, "ampdu_count %d  tx_underflows %d\n",
+		current_ampdu_cnt, fifo->accum_txfunfl);
 
 	/*
 	   compute the current ratio of tx unfl per ampdu.
@@ -366,7 +365,6 @@ static int wlc_ffpld_check_txfunfl(struct wlc_info *wlc, int fid)
 	 */
 
 	if (fifo->ampdu_pld_size >= max_mpdu * FFPLD_MPDU_SIZE) {
-		WL_FFPLD(("tx fifo pld : max ampdu fits in fifo\n)"));
 		fifo->accum_txfunfl = 0;
 		return 0;
 	}
@@ -392,8 +390,9 @@ static int wlc_ffpld_check_txfunfl(struct wlc_info *wlc, int fid)
 		      (max_mpdu * FFPLD_MPDU_SIZE - fifo->ampdu_pld_size))
 		     / (max_mpdu * FFPLD_MPDU_SIZE)) * 100;
 
-		WL_FFPLD("DMA estimated transfer rate %d; pre-load size %d\n",
-			 fifo->dmaxferrate, fifo->ampdu_pld_size);
+		BCMMSG(wlc->wiphy, "DMA estimated transfer rate %d; "
+			"pre-load size %d\n",
+			fifo->dmaxferrate, fifo->ampdu_pld_size);
 	} else {
 
 		/* decrease ampdu size */
diff --git a/trunk/drivers/staging/brcm80211/include/wlioctl.h b/trunk/drivers/staging/brcm80211/include/wlioctl.h
index 5e2b11bcfc6f..1e11c42939c5 100644
--- a/trunk/drivers/staging/brcm80211/include/wlioctl.h
+++ b/trunk/drivers/staging/brcm80211/include/wlioctl.h
@@ -1247,8 +1247,6 @@ typedef struct tx_inst_power {
 /* Message levels */
 #define WL_ERROR_VAL		0x00000001
 #define WL_TRACE_VAL		0x00000002
-#define WL_AMPDU_VAL		0x20000000
-#define WL_FFPLD_VAL		0x40000000
 
 /* maximum channels returned by the get valid channels iovar */
 #define WL_NUMCHANNELS		64