From 701312a37691499ea8066c156f9616433257098a Mon Sep 17 00:00:00 2001
From: Mike McCormack <mikem@ring3k.org>
Date: Mon, 27 Dec 2010 21:50:14 +0900
Subject: [PATCH] --- yaml --- r: 235624 b: refs/heads/master c:
 5d33549a525c737e9ad437638aa9bf812037bdf2 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/staging/rtl8192e/r8192E.h      | 6 ------
 trunk/drivers/staging/rtl8192e/r8192E_core.c | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index b3c8545fdda1..0ad8d83e5ab5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd1847332a5e5c6ac945ad12db0bc49871481d3a
+refs/heads/master: 5d33549a525c737e9ad437638aa9bf812037bdf2
diff --git a/trunk/drivers/staging/rtl8192e/r8192E.h b/trunk/drivers/staging/rtl8192e/r8192E.h
index 4a83958ac24d..853783762404 100644
--- a/trunk/drivers/staging/rtl8192e/r8192E.h
+++ b/trunk/drivers/staging/rtl8192e/r8192E.h
@@ -152,11 +152,6 @@ do { if(rt_global_debug_component & component) \
 
 #define RTL819x_DEBUG
 #ifdef RTL819x_DEBUG
-#define assert(expr) \
-        if (!(expr)) {                                  \
-                printk( "Assertion failed! %s,%s,%s,line=%d\n", \
-                #expr,__FILE__,__FUNCTION__,__LINE__);          \
-        }
 //wb added to debug out data buf
 //if you want print DATA buffer related BA, please set ieee80211_debug_level to DATA|BA
 #define RT_DEBUG_DATA(level, data, datalen)      \
@@ -174,7 +169,6 @@ do { if(rt_global_debug_component & component) \
                 }                                       \
         } while (0)
 #else
-#define assert(expr) do {} while (0)
 #define RT_DEBUG_DATA(level, data, datalen) do {} while(0)
 #endif /* RTL8169_DEBUG */
 
diff --git a/trunk/drivers/staging/rtl8192e/r8192E_core.c b/trunk/drivers/staging/rtl8192e/r8192E_core.c
index 54853ee9e0ef..bace6b346612 100644
--- a/trunk/drivers/staging/rtl8192e/r8192E_core.c
+++ b/trunk/drivers/staging/rtl8192e/r8192E_core.c
@@ -978,7 +978,7 @@ static void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev,
 	u8 queue_index = tcb_desc->queue_index;
 
 	/* shall not be referred by command packet */
-	assert(queue_index != TXCMD_QUEUE);
+	BUG_ON(queue_index == TXCMD_QUEUE);
 
 	if (priv->bHwRadioOff || (!priv->up))
 	{