diff options
| author | Akash Patel <c_akashp@qca.qualcomm.com> | 2014-04-04 10:53:54 -0700 |
|---|---|---|
| committer | Akash Patel <c_akashp@qca.qualcomm.com> | 2014-04-04 11:25:36 -0700 |
| commit | 39cc4b0c7aaea3792cbfde2d216177b71e36c3f5 (patch) | |
| tree | 9d503dd8bb93f73ec6f3844baac2814d392bf1ec | |
| parent | 4bd7a166241251574a3fb3b10428d0bdb5c0b3d6 (diff) | |
Solved conflict marks.
wlan: Fix of crash issue with batch scan disabled
Change-Id: I31122a43dd5cbe0f8213539ca20a6c7350da4cc6
| -rw-r--r-- | CORE/WDI/CP/inc/wlan_qct_wdi_i.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/CORE/WDI/CP/inc/wlan_qct_wdi_i.h b/CORE/WDI/CP/inc/wlan_qct_wdi_i.h index 72577b5fa9d7..7f0b3331432e 100644 --- a/CORE/WDI/CP/inc/wlan_qct_wdi_i.h +++ b/CORE/WDI/CP/inc/wlan_qct_wdi_i.h @@ -438,12 +438,7 @@ typedef enum WDI_LPHB_CFG_REQ = 85, /* WLAN FW set batch scan request */ -<<<<<<< HEAD WDI_SET_BATCH_SCAN_REQ = 86, -#endif -======= - WDI_SET_BATCH_SCAN_REQ = 88, ->>>>>>> b786da9... wlan: Fix of crash issue with batch scan disabled /*WLAN DAL Set Max Tx Power Per band Request*/ WDI_SET_MAX_TX_POWER_PER_BAND_REQ = 87, @@ -740,9 +735,7 @@ typedef enum /* WLAN FW LPHB Config response */ WDI_LPHB_CFG_RESP = 84, -#ifdef FEATURE_WLAN_BATCH_SCAN WDI_SET_BATCH_SCAN_RESP = 85, -#endif WDI_SET_MAX_TX_POWER_PER_BAND_RSP = 86, @@ -805,9 +798,7 @@ typedef enum /* Periodic Tx Pattern Indication from FW to Host */ WDI_HAL_PERIODIC_TX_PTRN_FW_IND = WDI_HAL_IND_MIN + 16, -#ifdef FEATURE_WLAN_BATCH_SCAN WDI_BATCHSCAN_RESULT_IND = WDI_HAL_IND_MIN + 17, -#endif WDI_MAX_RESP }WDI_ResponseEnumType; |