From: Larry Finger Date: Thu, 14 Jul 2011 14:43:36 +0000 (-0500) Subject: staging: rtl8192e: Remove dead code associated with WMM_Hang_8187 X-Git-Tag: v3.2-rc1~169^2^2~864^2~132^2~23 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=eccf634fc84c2e441b34a2c0bc4706616b8ff005;p=~emulex%2Finfiniband.git staging: rtl8192e: Remove dead code associated with WMM_Hang_8187 This patch also removes an "#if 1 .... #endif" that survived an earlier edit. Signed-off-by: Larry Finger --- diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index cb83fffd4a1..a138e52f6a5 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1633,10 +1633,6 @@ enum {WMM_all_frame, WMM_two_frame, WMM_four_frame, WMM_six_frame}; #define RTLLIB_PS_UNICAST RTLLIB_DTIM_UCAST #define RTLLIB_PS_MBCAST RTLLIB_DTIM_MBCAST -#ifdef WMM_Hang_8187 -#undef WMM_Hang_8187 -#endif - #define WME_AC_BK 0x00 #define WME_AC_BE 0x01 #define WME_AC_VI 0x02 @@ -1647,14 +1643,13 @@ enum {WMM_all_frame, WMM_two_frame, WMM_four_frame, WMM_six_frame}; #define MAX_RECEIVE_BUFFER_SIZE 9100 -#if 1 #define UP2AC(up) ( \ ((up) < 1) ? WME_AC_BE : \ ((up) < 3) ? WME_AC_BK : \ ((up) < 4) ? WME_AC_BE : \ ((up) < 6) ? WME_AC_VI : \ WME_AC_VO) -#endif + #define AC2UP(_ac) ( \ ((_ac) == WME_AC_VO) ? 6 : \ ((_ac) == WME_AC_VI) ? 5 : \