Merge 8cd10f873d on remote branch
Change-Id: I96ea702eddc3e924852095f7e18cf1f54818c950
This commit is contained in:
@@ -21129,7 +21129,10 @@ static void hdd_set_wapi_crypto_key_mgmt_param(struct hdd_adapter *adapter)
|
||||
if (adapter->wapi_info.wapi_auth_mode == WAPI_AUTH_MODE_CERT)
|
||||
HDD_SET_BIT(set_val, WLAN_CRYPTO_KEY_MGMT_WAPI_CERT);
|
||||
|
||||
/* Set AKM and original AKM type */
|
||||
wlan_crypto_set_vdev_param(vdev, WLAN_CRYPTO_PARAM_KEY_MGMT, set_val);
|
||||
wlan_crypto_set_vdev_param(vdev, WLAN_CRYPTO_PARAM_ORIG_KEY_MGMT,
|
||||
set_val);
|
||||
|
||||
set_val = 0;
|
||||
HDD_SET_BIT(set_val, WLAN_CRYPTO_CIPHER_WAPI_SMS4);
|
||||
|
||||
@@ -32,9 +32,9 @@
|
||||
#define QWLAN_VERSION_MAJOR 2
|
||||
#define QWLAN_VERSION_MINOR 0
|
||||
#define QWLAN_VERSION_PATCH 8
|
||||
#define QWLAN_VERSION_EXTRA "Y"
|
||||
#define QWLAN_VERSION_EXTRA "Z"
|
||||
#define QWLAN_VERSION_BUILD 34
|
||||
|
||||
#define QWLAN_VERSIONSTR "2.0.8.34Y"
|
||||
#define QWLAN_VERSIONSTR "2.0.8.34Z"
|
||||
|
||||
#endif /* QWLAN_VERSION_H */
|
||||
|
||||
Reference in New Issue
Block a user