From 88cd0dfcea6393de7235e59068c0c8d150562a36 Mon Sep 17 00:00:00 2001 From: bings Date: Tue, 9 Jun 2020 17:24:14 +0800 Subject: [PATCH] qcacmn: Remove redundant CONFIG_CRYPTO_COMPONENT There should be no reason to have macro CONFIG_CRYPTO_COMPONENT. Replace CONFIG_CRYPTO_COMPONENT with WLAN_CONV_CRYPTO_SUPPORTED. Change-Id: Ief2b015a8e48c85c383470c669254abfa7404585 CRs-Fixed: 2705994 --- os_if/linux/crypto/inc/wlan_cfg80211_crypto.h | 4 ++-- os_if/linux/crypto/src/wlan_cfg80211_crypto.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/os_if/linux/crypto/inc/wlan_cfg80211_crypto.h b/os_if/linux/crypto/inc/wlan_cfg80211_crypto.h index 1f4e8df2a253..64e760cb34f2 100644 --- a/os_if/linux/crypto/inc/wlan_cfg80211_crypto.h +++ b/os_if/linux/crypto/inc/wlan_cfg80211_crypto.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -24,7 +24,7 @@ #define _WLAN_CFG80211_CRYPTO_H_ #include #include "wlan_crypto_global_def.h" -#ifdef CONFIG_CRYPTO_COMPONENT +#ifdef WLAN_CONV_CRYPTO_SUPPORTED /** * wlan_cfg80211_set_default_key() - to set the default key to be used * @vdev: VDEV Object pointer diff --git a/os_if/linux/crypto/src/wlan_cfg80211_crypto.c b/os_if/linux/crypto/src/wlan_cfg80211_crypto.c index 30609bb2421a..e1b23a1c8199 100644 --- a/os_if/linux/crypto/src/wlan_cfg80211_crypto.c +++ b/os_if/linux/crypto/src/wlan_cfg80211_crypto.c @@ -150,7 +150,7 @@ int wlan_cfg80211_crypto_add_key(struct wlan_objmgr_vdev *vdev, return qdf_status_to_os_return(status); } -#ifdef CONFIG_CRYPTO_COMPONENT +#ifdef WLAN_CONV_CRYPTO_SUPPORTED int wlan_cfg80211_set_default_key(struct wlan_objmgr_vdev *vdev, uint8_t key_index, struct qdf_mac_addr *bssid) {