diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-03-29 12:34:33 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-03-29 12:34:33 -0700 |
| commit | b2e82439ffa4da47d6983bdf19aea40a5aeb2e69 (patch) | |
| tree | f6a174c0fdb4b4fef76bb40070187b9e247764bd | |
| parent | c1145ce758d0e6864af010510543e358326c90e4 (diff) | |
| parent | 199140ea99f6d01b5aac651c0baca1fb21a7980f (diff) | |
Merge "Release 1.0.0.75A QCACLD WLAN Driver"
| -rw-r--r-- | CORE/MAC/inc/qwlan_version.h | 4 | ||||
| -rw-r--r-- | CORE/SME/src/sme_common/sme_Api.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CORE/MAC/inc/qwlan_version.h b/CORE/MAC/inc/qwlan_version.h index 27f79bbef350..78327e46fe20 100644 --- a/CORE/MAC/inc/qwlan_version.h +++ b/CORE/MAC/inc/qwlan_version.h @@ -41,10 +41,10 @@ BRIEF DESCRIPTION: #define QWLAN_VERSION_MAJOR 1 #define QWLAN_VERSION_MINOR 0 #define QWLAN_VERSION_PATCH 0 -#define QWLAN_VERSION_EXTRA "" +#define QWLAN_VERSION_EXTRA "A" #define QWLAN_VERSION_BUILD 75 -#define QWLAN_VERSIONSTR "1.0.0.75" +#define QWLAN_VERSIONSTR "1.0.0.75A" #ifdef QCA_WIFI_2_0 diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c index 80108b711b14..5e26d5804463 100644 --- a/CORE/SME/src/sme_common/sme_Api.c +++ b/CORE/SME/src/sme_common/sme_Api.c @@ -10430,7 +10430,7 @@ eHalStatus sme_UpdateFwTdlsState(tHalHandle hHal, void *psmeTdlsParams, { eHalStatus status = eHAL_STATUS_SUCCESS; VOS_STATUS vosStatus = VOS_STATUS_SUCCESS; - tpAniSirGlobal pMac; + tpAniSirGlobal pMac = NULL; vos_msg_t vosMessage; /* only acquire sme global lock before state update if asked to */ |