qcacld: Remove un-used code under macro else section of GEN4_SCAN

This change set removes the code under else section of GEN4_SCAN
as the macro GEN4_SCAN is always set to 1.

Macro removed is GEN4_SCAN

CRs-Fixed: 738369
Change-Id: I06a7903fbaf0533d79d43a7432d3d59a84624a44

8 files changed, 0 insertions, 26 deletions

diff --git a/CORE/MAC/inc/aniGlobal.h b/CORE/MAC/inc/aniGlobal.h
index aff59d5682f4..78ee9f7eee08 100644
--- a/CORE/MAC/inc/aniGlobal.h
+++ b/CORE/MAC/inc/aniGlobal.h
@@ -512,7 +512,6 @@ typedef struct sAniSirLim
     /// Previous MLM State
     tLimMlmStates       gLimPrevMlmState;
 
-#ifdef GEN4_SCAN
     // LIM to HAL SCAN Management Message Interface states
     tLimLimHalScanState gLimHalScanState;
 //WLAN_SUSPEND_LINK Related
@@ -527,7 +526,6 @@ typedef struct sAniSirLim
     //current channel. CB state goes along with channel to resume to
     tANI_U16    gResumeChannel;
     ePhyChanBondState    gResumePhyCbState;
-#endif // GEN4_SCAN
 
     // Change channel generic scheme
     CHANGE_CHANNEL_CALLBACK gpchangeChannelCallback;
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h
index ac24bcb7de6e..ac625c4ccc6c 100644
--- a/CORE/MAC/inc/sirApi.h
+++ b/CORE/MAC/inc/sirApi.h
@@ -320,17 +320,12 @@ typedef enum eSirResultCodes
     eSIR_SME_CHANNEL_SWITCH_FAIL,        // failed to send out Channel Switch Action Frame
     eSIR_SME_INVALID_STA_ROLE,
     eSIR_SME_INVALID_STATE,
-#ifdef GEN4_SCAN
     eSIR_SME_CHANNEL_SWITCH_DISABLED,    // either 11h is disabled or channelSwitch is currently active
     eSIR_SME_HAL_SCAN_INIT_FAILED,       // SIR_HAL_SIR_HAL_INIT_SCAN_RSP returned failed status
     eSIR_SME_HAL_SCAN_START_FAILED,      // SIR_HAL_START_SCAN_RSP returned failed status
     eSIR_SME_HAL_SCAN_END_FAILED,        // SIR_HAL_END_SCAN_RSP returned failed status
     eSIR_SME_HAL_SCAN_FINISH_FAILED,     // SIR_HAL_FINISH_SCAN_RSP returned failed status
     eSIR_SME_HAL_SEND_MESSAGE_FAIL,      // Failed to send a message to HAL
-#else // GEN4_SCAN
-    eSIR_SME_CHANNEL_SWITCH_DISABLED,    // either 11h is disabled or channelSwitch is currently active
-    eSIR_SME_HAL_SEND_MESSAGE_FAIL,      // Failed to send a message to HAL
-#endif // GEN4_SCAN
 #ifdef FEATURE_OEM_DATA_SUPPORT
     eSIR_SME_HAL_OEM_DATA_REQ_START_FAILED,
 #endif
diff --git a/CORE/MAC/inc/sirMacProtDef.h b/CORE/MAC/inc/sirMacProtDef.h
index 9dd6542190b9..bf638f172e8e 100644
--- a/CORE/MAC/inc/sirMacProtDef.h
+++ b/CORE/MAC/inc/sirMacProtDef.h
@@ -80,10 +80,7 @@
 #define SIR_MAC_CTRL_CF_END     14
 #define SIR_MAC_CTRL_CF_END_ACK 15
 
-#define GEN4_SCAN         1
-#ifdef GEN4_SCAN
 #define SIR_MAC_MAX_DURATION_MICRO_SECONDS       32767
-#endif // GEN4_SCAN
 
 // Data frame subtype definitions
 #define SIR_MAC_DATA_DATA                 0
diff --git a/CORE/MAC/src/pe/include/limGlobal.h b/CORE/MAC/src/pe/include/limGlobal.h
index fd4c704bb859..bf3f1e99a33a 100644
--- a/CORE/MAC/src/pe/include/limGlobal.h
+++ b/CORE/MAC/src/pe/include/limGlobal.h
@@ -207,7 +207,6 @@ typedef enum eLimDot11hChanSwStates
     eLIM_11H_CHANSW_END
 } tLimDot11hChanSwStates;
 
-#ifdef GEN4_SCAN
 
 //WLAN_SUSPEND_LINK Related
 typedef void (*SUSPEND_RESUME_LINK_CALLBACK)(tpAniSirGlobal pMac, eHalStatus status, tANI_U32 *data);
@@ -231,7 +230,6 @@ typedef enum eLimHalScanState
   eLIM_HAL_RESUME_LINK_WAIT_STATE,
 //end WLAN_SUSPEND_LINK Related
 } tLimLimHalScanState;
-#endif // GEN4_SCAN
 
 // LIM states related to A-MPDU/BA
 // This is used for maintaining the state between PE and HAL only.
diff --git a/CORE/MAC/src/pe/lim/limApi.c b/CORE/MAC/src/pe/lim/limApi.c
index 9542f879e87d..359c16a0e0b7 100644
--- a/CORE/MAC/src/pe/lim/limApi.c
+++ b/CORE/MAC/src/pe/lim/limApi.c
@@ -206,10 +206,8 @@ static void __limInitStates(tpAniSirGlobal pMac)
     /// Previous MLM State
     pMac->lim.gLimPrevMlmState = eLIM_MLM_OFFLINE_STATE;
 
-#ifdef GEN4_SCAN
     // LIM to HAL SCAN Management Message Interface states
     pMac->lim.gLimHalScanState = eLIM_HAL_IDLE_SCAN_STATE;
-#endif // GEN4_SCAN
 
     /**
      * Initialize state to eLIM_SME_OFFLINE_STATE
diff --git a/CORE/MAC/src/pe/lim/limSendManagementFrames.c b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
index ced3f8bff9ba..688daba7c1a9 100644
--- a/CORE/MAC/src/pe/lim/limSendManagementFrames.c
+++ b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
@@ -394,9 +394,6 @@ limSendProbeReqMgmtFrame(tpAniSirGlobal pMac,
     tANI_U8             txFlag = 0;
     tANI_U8             smeSessionId = 0;
 
-#ifndef GEN4_SCAN
-    return eSIR_FAILURE;
-#endif
 
 
     /* The probe req should not send 11ac capabilieties if band is 2.4GHz,
diff --git a/CORE/MAC/src/pe/lim/limTypes.h b/CORE/MAC/src/pe/lim/limTypes.h
index 15226d109a98..3a5889aa2b52 100644
--- a/CORE/MAC/src/pe/lim/limTypes.h
+++ b/CORE/MAC/src/pe/lim/limTypes.h
@@ -778,7 +778,6 @@ void limProcessMlmSetBssKeyRsp( tpAniSirGlobal pMac, tpSirMsgQ limMsgQ );
 
 
 
-#ifdef GEN4_SCAN
 // Function to process WDA_INIT_SCAN_RSP message
 void limProcessInitScanRsp(tpAniSirGlobal,  void * );
 
@@ -808,7 +807,6 @@ tANI_U8 limIsLinkSuspended(tpAniSirGlobal pMac);
 void limSuspendLink(tpAniSirGlobal, tSirLinkTrafficCheck, SUSPEND_RESUME_LINK_CALLBACK, tANI_U32*);
 void limResumeLink(tpAniSirGlobal, SUSPEND_RESUME_LINK_CALLBACK, tANI_U32*);
 //end WLAN_SUSPEND_LINK Related
-#endif // GEN4_SCAN
 
 tSirRetStatus limSendAddBAReq( tpAniSirGlobal pMac,
     tpLimMlmAddBAReq pMlmAddBAReq,tpPESession);
diff --git a/CORE/MAC/src/pe/lim/limUtils.c b/CORE/MAC/src/pe/lim/limUtils.c
index c56368820c57..0a0e763ca317 100644
--- a/CORE/MAC/src/pe/lim/limUtils.c
+++ b/CORE/MAC/src/pe/lim/limUtils.c
@@ -530,7 +530,6 @@ char *limResultCodeStr(tSirResultCodes resultCode)
             return "eSIR_SME_RECEIVED";
       case eSIR_SME_CHANNEL_SWITCH_FAIL:
             return "eSIR_SME_CHANNEL_SWITCH_FAIL";
-#ifdef GEN4_SCAN
       case eSIR_SME_CHANNEL_SWITCH_DISABLED:
             return "eSIR_SME_CHANNEL_SWITCH_DISABLED";
       case eSIR_SME_HAL_SCAN_INIT_FAILED:
@@ -543,12 +542,6 @@ char *limResultCodeStr(tSirResultCodes resultCode)
             return "eSIR_SME_HAL_SCAN_FINISH_FAILED";
       case eSIR_SME_HAL_SEND_MESSAGE_FAIL:
             return "eSIR_SME_HAL_SEND_MESSAGE_FAIL";
-#else // GEN4_SCAN
-      case eSIR_SME_CHANNEL_SWITCH_DISABLED:
-            return "eSIR_SME_CHANNEL_SWITCH_DISABLED";
-      case eSIR_SME_HAL_SEND_MESSAGE_FAIL:
-            return "eSIR_SME_HAL_SEND_MESSAGE_FAIL";
-#endif // GEN4_SCAN
 
         default:
             return "INVALID resultCode";