From 8524fdd6f8074d982f35f76431f63d20a90c2955 Mon Sep 17 00:00:00 2001
From: Kiran Venkatappa <kiranv@codeaurora.org>
Date: Fri, 2 Dec 2016 13:49:30 +0530
Subject: [PATCH] qcacmn: Fix compilation for r96 headers

Add HW version check to remove referencing macros
not available in r96 headers. RING_ID_BMSK seems to be
removed in r96, Use it only for older version hw headers.

Change-Id: I0467a900317581ae7040ab0baae288ed9a905d60
CRs-Fixed: 1090092
---
 hal/wifi3.0/hal_srng.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/hal/wifi3.0/hal_srng.c b/hal/wifi3.0/hal_srng.c
index dcdbd08641..8893ac32db 100644
--- a/hal/wifi3.0/hal_srng.c
+++ b/hal/wifi3.0/hal_srng.c
@@ -28,6 +28,9 @@
  */
 
 #include "hal_api.h"
+#ifdef CONFIG_WIN
+#include "wcss_version.h"
+#endif
 
 /**
  * Common SRNG register access macros:
@@ -612,8 +615,12 @@ static inline void hal_srng_src_hw_init(struct hal_soc *hal,
 		srng->entry_size * srng->num_entries);
 	SRNG_SRC_REG_WRITE(srng, BASE_MSB, reg_val);
 
+#if defined(WCSS_VERSION) && (WCSS_VERSION > 81)
+	reg_val = SRNG_SM(SRNG_SRC_FLD(ID, ENTRY_SIZE), srng->entry_size);
+#else
 	reg_val = SRNG_SM(SRNG_SRC_FLD(ID, RING_ID), srng->ring_id) |
 		SRNG_SM(SRNG_SRC_FLD(ID, ENTRY_SIZE), srng->entry_size);
+#endif
 	SRNG_SRC_REG_WRITE(srng, ID, reg_val);
 
 	reg_val = ((srng->flags & HAL_SRNG_DATA_TLV_SWAP) ?