From 793fd05680a331acd18da347ebb7830b7916b46d Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Thu, 28 Feb 2019 15:41:16 -0800 Subject: [PATCH] qcacld-3.0: Remove file cds_if_upperproto.h Remove file cds_if_upperproto.h. Change-Id: Iaef5431c93e1f13ab8afb908ad6ca140ee22d087 CRs-Fixed: 2436677 --- core/cds/inc/cds_if_upperproto.h | 27 --------------------------- core/dp/txrx/ol_txrx_types.h | 2 ++ core/hdd/src/wlan_hdd_hostapd.c | 2 +- 3 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 core/cds/inc/cds_if_upperproto.h diff --git a/core/cds/inc/cds_if_upperproto.h b/core/cds/inc/cds_if_upperproto.h deleted file mode 100644 index 9e546eee1bd1..000000000000 --- a/core/cds/inc/cds_if_upperproto.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2011, 2014, 2017, 2019 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 - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef _NET_IF_UPPERPROTO_H_ -#define _NET_IF_UPPERPROTO_H_ - -#define ETHERTYPE_OCB_TX 0x8151 -#define ETHERTYPE_OCB_RX 0x8152 - -#define ETHER_IS_MULTICAST(addr) (*(addr) & 0x01) /* is address mcast/bcast? */ - -#endif /* _NET_IF_UPPERPROTO_H_ */ diff --git a/core/dp/txrx/ol_txrx_types.h b/core/dp/txrx/ol_txrx_types.h index 32cc5aa12a1d..08a70db2a042 100644 --- a/core/dp/txrx/ol_txrx_types.h +++ b/core/dp/txrx/ol_txrx_types.h @@ -77,6 +77,8 @@ #define TXRX_DATA_HISTROGRAM_NUM_INTERVALS 100 #define OL_TXRX_INVALID_VDEV_ID (-1) +#define ETHERTYPE_OCB_TX 0x8151 +#define ETHERTYPE_OCB_RX 0x8152 struct ol_txrx_pdev_t; struct ol_txrx_vdev_t; diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index be08dc0df5a5..90de92b189c1 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -700,7 +700,7 @@ static int __hdd_hostapd_set_mac_address(struct net_device *dev, void *addr) return -EINVAL; } - if (ETHER_IS_MULTICAST(psta_mac_addr->sa_data)) { + if (qdf_is_macaddr_group(&mac_addr)) { hdd_err("MAC is Multicast"); return -EINVAL; }