From 638b5acd4dfe9dd79260a9c824be74b29408ee9a Mon Sep 17 00:00:00 2001 From: Florian Schilhabel Date: Wed, 14 Jul 2010 14:42:25 +0200 Subject: [PATCH 367/524] staging: rtl8192su: fix a compiler warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix for: drivers/staging/rtl8192su/r8192U_core.c: In function ‘rtl8192SU_MacConfigAfterFwDownload’: drivers/staging/rtl8192su/r8192U_core.c:4403:24: warning: comparison between ‘rtl819xUsb_loopback_e’ and ‘enum _RTL8192SUSB_LOOPBACK’ drivers/staging/rtl8192su/r8192U_core.c:4405:30: warning: comparison between ‘rtl819xUsb_loopback_e’ and ‘enum _RTL8192SUSB_LOOPBACK’ Signed-off-by: Florian Schilhabel Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8192su/r8192U.h | 16 +++------------- 1 files changed, 3 insertions(+), 13 deletions(-) diff --git a/drivers/staging/rtl8192su/r8192U.h b/drivers/staging/rtl8192su/r8192U.h index eccf447..d4f2d99 100644 --- a/drivers/staging/rtl8192su/r8192U.h +++ b/drivers/staging/rtl8192su/r8192U.h @@ -687,13 +687,6 @@ typedef enum rf_optype RF_OP_By_FW, RF_OP_MAX }rf_op_type; -/* 8190 Loopback Mode definition */ -typedef enum _rtl819xUsb_loopback{ - RTL819xU_NO_LOOPBACK = 0, - RTL819xU_MAC_LOOPBACK = 1, - RTL819xU_DMA_LOOPBACK = 2, - RTL819xU_CCK_LOOPBACK = 3, -}rtl819xUsb_loopback_e; /* for rtl819x */ typedef enum _RT_STATUS{ @@ -703,16 +696,13 @@ typedef enum _RT_STATUS{ RT_STATUS_RESOURCE = 3 }RT_STATUS,*PRT_STATUS; -//#ifdef RTL8192SU typedef enum _RTL8192SUSB_LOOPBACK{ RTL8192SU_NO_LOOPBACK = 0, RTL8192SU_MAC_LOOPBACK = 1, RTL8192SU_DMA_LOOPBACK = 2, RTL8192SU_CCK_LOOPBACK = 3, }RTL8192SUSB_LOOPBACK_E; -//#endif -//+by amy 080507 #define MAX_RECEIVE_BUFFER_SIZE 9100 // Add this to 9100 bytes to receive A-MSDU from RT-AP @@ -1245,7 +1235,7 @@ typedef struct r8192_priv bool bCurrentRxAggrEnable; u8 Rf_Mode; //add for Firmware RF -R/W switch prt_firmware pFirmware; - rtl819xUsb_loopback_e LoopbackMode; + RTL8192SUSB_LOOPBACK_E LoopbackMode; bool usb_error; u16 EEPROMTxPowerDiff; @@ -1495,11 +1485,11 @@ typedef struct r8192_priv LED_819xUsb SwLed0; LED_819xUsb SwLed1; u8 bRegUseLed; - struct work_struct BlinkWorkItem; + struct work_struct BlinkWorkItem; /* added for led control */ u16 FwCmdIOMap; u32 FwCmdIOParam; - u8 DMFlag; + u8 DMFlag; -- 1.7.1