Merge "qcacmn: Add new config file for scan params"
diff --git a/hal/wifi3.0/hal_generic_api.h b/hal/wifi3.0/hal_generic_api.h
index e93c56b..915fb80 100644
--- a/hal/wifi3.0/hal_generic_api.h
+++ b/hal/wifi3.0/hal_generic_api.h
@@ -1281,8 +1281,10 @@
FCS_ERR);
return HAL_TLV_STATUS_MPDU_END;
case WIFIRX_MSDU_END_E:
- ppdu_info->rx_msdu_info[user_id].cce_metadata =
- HAL_RX_MSDU_END_CCE_METADATA_GET(rx_tlv);
+ if (user_id < HAL_MAX_UL_MU_USERS) {
+ ppdu_info->rx_msdu_info[user_id].cce_metadata =
+ HAL_RX_MSDU_END_CCE_METADATA_GET(rx_tlv);
+ }
return HAL_TLV_STATUS_MSDU_END;
case 0:
return HAL_TLV_STATUS_PPDU_DONE;
diff --git a/qdf/linux/src/i_qdf_types.h b/qdf/linux/src/i_qdf_types.h
index 2c68abf..60d21b2 100644
--- a/qdf/linux/src/i_qdf_types.h
+++ b/qdf/linux/src/i_qdf_types.h
@@ -98,11 +98,26 @@
typedef unsigned long phys_addr_t;
typedef unsigned long __sgtable_t;
+#ifndef SIOCGIWAP
#define SIOCGIWAP 0
+#endif
+
+#ifndef IWEVCUSTOM
#define IWEVCUSTOM 0
+#endif
+
+#ifndef IWEVREGISTERED
#define IWEVREGISTERED 0
+#endif
+
+#ifndef IWEVEXPIRED
#define IWEVEXPIRED 0
+#endif
+
+#ifndef SIOCGIWSCAN
#define SIOCGIWSCAN 0
+#endif
+
#define DMA_TO_DEVICE 0
#define DMA_BIDIRECTIONAL 0
#define DMA_FROM_DEVICE 0