From 8bf184d6e4b663198ace81182b00de0f9bc541bc Mon Sep 17 00:00:00 2001 From: Dustin Brown Date: Wed, 17 Jan 2018 15:00:29 -0800 Subject: [PATCH] qcacmn: Remove QDF_MAC_ADDR_ZERO_INITIALIZER QDF_MAC_ADDR_ZERO_INITIALIZER has been depreciated in favor of QDF_MAC_ADDR_ZERO_INIT. Replace all usages with the new macro. Change-Id: I565a01fe3c75da645d5f410ce2c54f02034fb14c CRs-Fixed: 2176469 --- qdf/inc/qdf_types.h | 2 -- qdf/inc/qdf_util.h | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/qdf/inc/qdf_types.h b/qdf/inc/qdf_types.h index 5b994d7dd7..b8404b311b 100644 --- a/qdf/inc/qdf_types.h +++ b/qdf/inc/qdf_types.h @@ -663,8 +663,6 @@ typedef enum { #define QDF_MAC_ADDRESS_STR QDF_MAC_ADDR_STR /* backwards compatibility; use QDF_MAC_ADDR_BCAST_INIT instead */ #define QDF_MAC_ADDR_BROADCAST_INITIALIZER QDF_MAC_ADDR_BCAST_INIT -/* backwards compatibility; use QDF_MAC_ADDR_ZERO_INIT instead */ -#define QDF_MAC_ADDR_ZERO_INITIALIZER QDF_MAC_ADDR_ZERO_INIT /** * struct qdf_mac_addr - A MAC address diff --git a/qdf/inc/qdf_util.h b/qdf/inc/qdf_util.h index 713534cd15..848b8fafaf 100644 --- a/qdf/inc/qdf_util.h +++ b/qdf/inc/qdf_util.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -225,7 +225,7 @@ static inline bool qdf_is_macaddr_equal(struct qdf_mac_addr *mac_addr1, */ static inline bool qdf_is_macaddr_zero(struct qdf_mac_addr *mac_addr) { - struct qdf_mac_addr zero_mac_addr = QDF_MAC_ADDR_ZERO_INITIALIZER; + struct qdf_mac_addr zero_mac_addr = QDF_MAC_ADDR_ZERO_INIT; return qdf_is_macaddr_equal(mac_addr, &zero_mac_addr); }