From edee5ca0b9c6d6fd02d68699c59788081eda3c3f Mon Sep 17 00:00:00 2001
From: Thierry Strudel <tstrudel@google.com>
Date: Fri, 24 Jul 2015 23:11:59 -0700
Subject: [PATCH] prima: release v3.2.3.23

    git://codeaurora.org/external/wlan/prima.git

    41d7e5b wlan: release 3.2.3.23
    11cfab7 wlan: check for sus_res_mcastbcast_filter_valid before resetting

Change-Id: I828c6e73eb13ec42447f2069ad20b4576c2c4090
Signed-off-by: Thierry Strudel <tstrudel@google.com>
---
 drivers/staging/prima/CORE/HDD/src/wlan_hdd_assoc.c      | 9 ++++++---
 .../staging/prima/CORE/HDD/src/wlan_hdd_early_suspend.c  | 8 +++++---
 drivers/staging/prima/CORE/MAC/inc/qwlan_version.h       | 4 ++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/prima/CORE/HDD/src/wlan_hdd_assoc.c b/drivers/staging/prima/CORE/HDD/src/wlan_hdd_assoc.c
index e235595251e2..0fa1bbf72168 100755
--- a/drivers/staging/prima/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/drivers/staging/prima/CORE/HDD/src/wlan_hdd_assoc.c
@@ -2299,9 +2299,12 @@ eHalStatus hdd_smeRoamCallback( void *pContext, tCsrRoamInfo *pRoamInfo, tANI_U3
                 if (pHddCtx->hdd_mcastbcast_filter_set == TRUE)
                 {
                     hdd_conf_mcastbcast_filter(pHddCtx, FALSE);
-                    pHddCtx->configuredMcastBcastFilter =
-                        pHddCtx->sus_res_mcastbcast_filter;
-                    pHddCtx->sus_res_mcastbcast_filter_valid = VOS_FALSE;
+
+                    if (VOS_TRUE == pHddCtx->sus_res_mcastbcast_filter_valid) {
+                        pHddCtx->configuredMcastBcastFilter =
+                            pHddCtx->sus_res_mcastbcast_filter;
+                        pHddCtx->sus_res_mcastbcast_filter_valid = VOS_FALSE;
+                    }
 
                     hddLog(VOS_TRACE_LEVEL_INFO,
                            "offload: disassociation happening, restoring configuredMcastBcastFilter");
diff --git a/drivers/staging/prima/CORE/HDD/src/wlan_hdd_early_suspend.c b/drivers/staging/prima/CORE/HDD/src/wlan_hdd_early_suspend.c
index 6af5370921bf..56b4ed4242d2 100644
--- a/drivers/staging/prima/CORE/HDD/src/wlan_hdd_early_suspend.c
+++ b/drivers/staging/prima/CORE/HDD/src/wlan_hdd_early_suspend.c
@@ -1153,9 +1153,11 @@ static void hdd_conf_resume_ind(hdd_adapter_t *pAdapter)
 
     pHddCtx->hdd_mcastbcast_filter_set = FALSE;
 
-    pHddCtx->configuredMcastBcastFilter =
-      pHddCtx->sus_res_mcastbcast_filter;
-    pHddCtx->sus_res_mcastbcast_filter_valid = VOS_FALSE;
+    if (VOS_TRUE == pHddCtx->sus_res_mcastbcast_filter_valid) {
+        pHddCtx->configuredMcastBcastFilter =
+            pHddCtx->sus_res_mcastbcast_filter;
+        pHddCtx->sus_res_mcastbcast_filter_valid = VOS_FALSE;
+    }
 
     hddLog(VOS_TRACE_LEVEL_INFO,
            "offload: in hdd_conf_resume_ind, restoring configuredMcastBcastFilter");
diff --git a/drivers/staging/prima/CORE/MAC/inc/qwlan_version.h b/drivers/staging/prima/CORE/MAC/inc/qwlan_version.h
index 2c8fdff9d36a..548d9e215c1e 100644
--- a/drivers/staging/prima/CORE/MAC/inc/qwlan_version.h
+++ b/drivers/staging/prima/CORE/MAC/inc/qwlan_version.h
@@ -60,9 +60,9 @@ BRIEF DESCRIPTION:
 #define QWLAN_VERSION_MINOR            2
 #define QWLAN_VERSION_PATCH            3
 #define QWLAN_VERSION_EXTRA            ""
-#define QWLAN_VERSION_BUILD            22
+#define QWLAN_VERSION_BUILD            23
 
-#define QWLAN_VERSIONSTR              "3.2.3.22"
+#define QWLAN_VERSIONSTR              "3.2.3.23"
 
 #endif /* QWLAN_VERSION_H */
 
-- 
GitLab