[RAMEN9610-21027]wlbt: Resetting the QoS Info after use, instead on VIF Deactivation.

Resetting the QoS Info after use, instead on
VIF Deactivation, to maintain the consistency
of QoS Info data.

Change-Id: I6b5fcc2336a236652e8d9f6c3f6bbfc9d1eb5111
SCSC-Bug-Id: HOST-11594
Signed-off-by: Mohit Ghuley <mohit.ghuley@samsung.com>
Signed-off-by: Youngsoo <youngss.kim@samsung.com>

diff --git a/drivers/net/wireless/scsc/mgt.c b/drivers/net/wireless/scsc/mgt.c
index e059adf290043000b24fa0f11714de97e479f7cf..f56f49141fc4b1808e7685ceeeb6a19caba49151 100755 (executable)
--- a/drivers/net/wireless/scsc/mgt.c
+++ b/drivers/net/wireless/scsc/mgt.c
@@ -2510,8 +2510,6 @@ void slsi_vif_deactivated(struct slsi_dev *sdev, struct net_device *dev)
                }
                ndev_vif->sta.tdls_enabled = false;
        }
-
-       sdev->device_config.qos_info = -1;
 }
 
 int slsi_sta_ieee80211_mode(struct net_device *dev, u16 current_bss_channel_frequency)

diff --git a/drivers/net/wireless/scsc/mlme.c b/drivers/net/wireless/scsc/mlme.c
index c114abf58279ee8d5fac8b825a2f1eb2530e9411..0ef06bf974ebe3db5a6dc7dd4a19cd5f8386f9fe 100755 (executable)
--- a/drivers/net/wireless/scsc/mlme.c
+++ b/drivers/net/wireless/scsc/mlme.c
@@ -2003,6 +2003,7 @@ static int slsi_mlme_connect_info_elems_ie_prep(struct slsi_dev *sdev, const u8
                                SLSI_ERR_NODEV("Required 9bytes but left:%d\n", ie_dest_len);
                                return -EINVAL;
                        }
+                       sdev->device_config.qos_info = -1;
                } else {
                        info_elem_length += 9;
                }

diff --git a/include/scsc/scsc_release.h b/include/scsc/scsc_release.h
index 3d022b5b1a6960dfc95041ceab34a249475abcd1..37810c6ae32a1e829c6c7851deaad9409acc2d50 100644 (file)
--- a/include/scsc/scsc_release.h
+++ b/include/scsc/scsc_release.h
@@ -23,7 +23,7 @@
 #define SCSC_RELEASE_ITERATION 9
 #define SCSC_RELEASE_CANDIDATE 1
 
-#define SCSC_RELEASE_POINT 0
+#define SCSC_RELEASE_POINT 1
 
 #endif