From 71f6f4b0093dec1919a1235ad4b324cee9cfe4d6 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Wed, 13 Jul 2011 18:50:46 -0500
Subject: [PATCH] --- yaml --- r: 267674 b: refs/heads/master c:
 02525969666f1fe4718705d372afaafa9d12b612 h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/staging/rtl8192e/rtllib_softmac.c | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 5ca535d9a919..e88cf339b0e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94114a5ad75c6c9dcc931170855d2a90eea53d97
+refs/heads/master: 02525969666f1fe4718705d372afaafa9d12b612
diff --git a/trunk/drivers/staging/rtl8192e/rtllib_softmac.c b/trunk/drivers/staging/rtl8192e/rtllib_softmac.c
index b4279d7049ec..b9b5a1053e5c 100644
--- a/trunk/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/trunk/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -119,15 +119,7 @@ void rtllib_WMM_Info(struct rtllib_device *ieee, u8 **tag_p) {
 	*tag++ = 0x02;
 	*tag++ = 0x00;
 	*tag++ = 0x01;
-#ifdef SUPPORT_USPD
-	if (ieee->current_network.wmm_info & 0x80) {
-		*tag++ = 0x0f|MAX_SP_Len;
-	} else {
-		*tag++ = MAX_SP_Len;
-	}
-#else
 	*tag++ = MAX_SP_Len;
-#endif
 	*tag_p = tag;
 }