Merge "qcacld-3.0: Handle disassociate reason code 34 and cleanup logs" into wlan-cld3.driver.lnx.1.1-dev
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index 10738b2..2ee4e27 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -1961,6 +1961,14 @@
WLAN_CONTROL_PATH);
}
+ /* Enable carrier and transmit queues for NDI */
+ if (WLAN_HDD_IS_NDI(adapter)) {
+ hdd_notice("Enabling Tx Queues");
+ wlan_hdd_netif_queue_control(adapter,
+ WLAN_START_ALL_NETIF_QUEUE_N_CARRIER,
+ WLAN_CONTROL_PATH);
+ }
+
return ret;
}
@@ -2029,6 +2037,18 @@
WLAN_CONTROL_PATH);
/*
+ * NAN data interface is different in some sense. The traffic on NDI is
+ * bursty in nature and depends on the need to transfer. The service
+ * layer may down the interface after the usage and up again when
+ * required. In some sense, the NDI is expected to be available
+ * (like SAP) iface until NDI delete request is issued by the service
+ * layer. Skip BSS termination and adapter deletion for NAN Data
+ * interface (NDI).
+ */
+ if (WLAN_HDD_IS_NDI(adapter))
+ return 0;
+
+ /*
* The interface is marked as down for outside world (aka kernel)
* But the driver is pretty much alive inside. The driver needs to
* tear down the existing connection on the netdev (session)
diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h
index 0515cfc..e058e55 100644
--- a/core/mac/inc/qwlan_version.h
+++ b/core/mac/inc/qwlan_version.h
@@ -41,9 +41,9 @@
#define QWLAN_VERSION_MAJOR 5
#define QWLAN_VERSION_MINOR 1
#define QWLAN_VERSION_PATCH 0
-#define QWLAN_VERSION_EXTRA "R"
+#define QWLAN_VERSION_EXTRA "S"
#define QWLAN_VERSION_BUILD 30
-#define QWLAN_VERSIONSTR "5.1.0.30R"
+#define QWLAN_VERSIONSTR "5.1.0.30S"
#endif /* QWLAN_VERSION_H */