From 33d5173722f795d91691a9e555a495a94a422873 Mon Sep 17 00:00:00 2001
From: Chris Guo <kangxu@codeaurora.org>
Date: Mon, 3 Jul 2017 21:10:59 +0800
Subject: [PATCH] qcacmn: Enable Bus bundle for both TX and RX

Because of the sequence of macro defination, the HTX bundle is
not enabled at all. This fix made the macro defination into the
correct sequence.

CRs-Fixed: 2070642
Change-Id: Idc62b091057da9873874f54f09ca8b76d3658516
---
 htc/htc_internal.h | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/htc/htc_internal.h b/htc/htc_internal.h
index 04686c58a2..cf56da56ae 100644
--- a/htc/htc_internal.h
+++ b/htc/htc_internal.h
@@ -257,19 +257,6 @@ typedef struct _HTC_TARGET {
 	uint8_t wmi_ep_count;
 } HTC_TARGET;
 
-#if defined ENABLE_BUNDLE_TX
-#define HTC_TX_BUNDLE_ENABLED(target) (target->MaxMsgsPerHTCBundle > 1)
-#else
-#define HTC_TX_BUNDLE_ENABLED(target) 0
-#endif
-
-#if defined ENABLE_BUNDLE_RX
-#define HTC_RX_BUNDLE_ENABLED(target) (target->MaxMsgsPerHTCBundle > 1)
-#else
-#define HTC_RX_BUNDLE_ENABLED(target) 0
-#endif
-
-#define HTC_ENABLE_BUNDLE(target) (target->MaxMsgsPerHTCBundle > 1)
 
 #ifdef RX_SG_SUPPORT
 #define RESET_RX_SG_CONFIG(_target) \
@@ -405,4 +392,19 @@ htc_send_complete_check(HTC_ENDPOINT *pEndpoint, int force) {
 #define ENABLE_BUNDLE_RX 1
 #endif
 #endif /*defined(HIF_SDIO) || defined(HIF_USB)*/
+
+#if defined ENABLE_BUNDLE_TX
+#define HTC_TX_BUNDLE_ENABLED(target) (target->MaxMsgsPerHTCBundle > 1)
+#else
+#define HTC_TX_BUNDLE_ENABLED(target) 0
+#endif
+
+#if defined ENABLE_BUNDLE_RX
+#define HTC_RX_BUNDLE_ENABLED(target) (target->MaxMsgsPerHTCBundle > 1)
+#else
+#define HTC_RX_BUNDLE_ENABLED(target) 0
+#endif
+
+#define HTC_ENABLE_BUNDLE(target) (target->MaxMsgsPerHTCBundle > 1)
+
 #endif /* !_HTC_HOST_INTERNAL_H_ */