From: Mike McCormack Date: Thu, 3 Mar 2011 13:44:28 +0000 (+0900) Subject: staging: rtl8192e: Move definition of RT_RF_CHANGE_SOURCE X-Git-Tag: v2.6.39-rc1~469^2~263 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=8e0af57d9eb893a27e35d09e29d89b974a5d375d;p=~emulex%2Finfiniband.git staging: rtl8192e: Move definition of RT_RF_CHANGE_SOURCE Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211.h b/drivers/staging/rtl8192e/ieee80211/ieee80211.h index f0627b1fd96..8ebedd0be77 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211.h +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211.h @@ -1825,13 +1825,6 @@ typedef struct _RT_POWER_SAVE_CONTROL }RT_POWER_SAVE_CONTROL,*PRT_POWER_SAVE_CONTROL; -typedef u32 RT_RF_CHANGE_SOURCE; -#define RF_CHANGE_BY_SW BIT31 -#define RF_CHANGE_BY_HW BIT30 -#define RF_CHANGE_BY_PS BIT29 -#define RF_CHANGE_BY_IPS BIT28 -#define RF_CHANGE_BY_INIT 0 // Do not change the RFOff reason. Defined by Bruce, 2008-01-17. - #ifdef ENABLE_DOT11D typedef enum { diff --git a/drivers/staging/rtl8192e/r8192E.h b/drivers/staging/rtl8192e/r8192E.h index a5c85e5e972..6a6d09578d4 100644 --- a/drivers/staging/rtl8192e/r8192E.h +++ b/drivers/staging/rtl8192e/r8192E.h @@ -192,6 +192,13 @@ do { if(rt_global_debug_component & component) \ #define EEPROM_Default_LegacyHTTxPowerDiff 0x4 #define IEEE80211_WATCH_DOG_TIME 2000 +typedef u32 RT_RF_CHANGE_SOURCE; +#define RF_CHANGE_BY_SW BIT31 +#define RF_CHANGE_BY_HW BIT30 +#define RF_CHANGE_BY_PS BIT29 +#define RF_CHANGE_BY_IPS BIT28 +#define RF_CHANGE_BY_INIT 0 // Do not change the RFOff reason. Defined by Bruce, 2008-01-17. + /* For rtl819x */ typedef struct _tx_desc_819x_pci { //DWORD 0