diff options
160 files changed, 154 insertions, 1445 deletions
diff --git a/dp/inc/cdp_txrx_bus.h b/dp/inc/cdp_txrx_bus.h index b110bd749e1d..df05a7aad7bb 100644 --- a/dp/inc/cdp_txrx_bus.h +++ b/dp/inc/cdp_txrx_bus.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ /** * @file cdp_txrx_bus.h * @brief Define the host data path bus related functions diff --git a/dp/inc/cdp_txrx_cfg.h b/dp/inc/cdp_txrx_cfg.h index 26aafb760679..4da9b3917a1b 100644 --- a/dp/inc/cdp_txrx_cfg.h +++ b/dp/inc/cdp_txrx_cfg.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ /** * @file cdp_txrx_cfg.h * @brief Define the host data path configuration API functions diff --git a/dp/inc/cdp_txrx_cmn.h b/dp/inc/cdp_txrx_cmn.h index a15717d11d5c..cbb5d4c2bb20 100644 --- a/dp/inc/cdp_txrx_cmn.h +++ b/dp/inc/cdp_txrx_cmn.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ /** * @file cdp_txrx_api_common.h * @brief Define the host data path converged API functions diff --git a/dp/inc/cdp_txrx_ctrl.h b/dp/inc/cdp_txrx_ctrl.h index a4f8fd46a016..65d0c5f539f7 100644 --- a/dp/inc/cdp_txrx_ctrl.h +++ b/dp/inc/cdp_txrx_ctrl.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ /** * @file cdp_txrx_ctrl.h * @brief Define the host data path control API functions diff --git a/dp/inc/cdp_txrx_flow_ctrl_legacy.h b/dp/inc/cdp_txrx_flow_ctrl_legacy.h index d08726c61533..fb19494ce047 100644 --- a/dp/inc/cdp_txrx_flow_ctrl_legacy.h +++ b/dp/inc/cdp_txrx_flow_ctrl_legacy.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ /** * @file cdp_txrx_flow_ctrl_legacy.h * @brief Define the host data path legacy flow control API diff --git a/dp/inc/cdp_txrx_flow_ctrl_v2.h b/dp/inc/cdp_txrx_flow_ctrl_v2.h index 21ed98ab0137..05e7c03ee821 100644 --- a/dp/inc/cdp_txrx_flow_ctrl_v2.h +++ b/dp/inc/cdp_txrx_flow_ctrl_v2.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ /** * @file cdp_txrx_flow_ctrl_v2.h * @brief Define the host data path flow control version 2 API diff --git a/dp/inc/cdp_txrx_host_stats.h b/dp/inc/cdp_txrx_host_stats.h index fd065803c7a9..d115c7fca12b 100644 --- a/dp/inc/cdp_txrx_host_stats.h +++ b/dp/inc/cdp_txrx_host_stats.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ /** * @file cdp_txrx_host_stats.h * @brief Define the host data path stats API functions diff --git a/dp/inc/cdp_txrx_ipa.h b/dp/inc/cdp_txrx_ipa.h index 39d42e386792..65999f84b22c 100644 --- a/dp/inc/cdp_txrx_ipa.h +++ b/dp/inc/cdp_txrx_ipa.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ /** * @file cdp_txrx_ipa.h * @brief Define the host data path IP Acceleraor API functions diff --git a/dp/inc/cdp_txrx_lro.h b/dp/inc/cdp_txrx_lro.h index 19e8b111dd29..5762cb991616 100644 --- a/dp/inc/cdp_txrx_lro.h +++ b/dp/inc/cdp_txrx_lro.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ /** * @file cdp_txrx_lro.h * @brief Define the host data path Large Receive Offload API diff --git a/dp/inc/cdp_txrx_me.h b/dp/inc/cdp_txrx_me.h index 60faf8ec24bf..7658c17b357b 100644 --- a/dp/inc/cdp_txrx_me.h +++ b/dp/inc/cdp_txrx_me.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ /** * @file cdp_txrx_me.h * @brief Define the host data path mcast enhance API functions diff --git a/dp/inc/cdp_txrx_misc.h b/dp/inc/cdp_txrx_misc.h index 2da7c2755416..ae0b98ff53e1 100644 --- a/dp/inc/cdp_txrx_misc.h +++ b/dp/inc/cdp_txrx_misc.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ /** * @file cdp_txrx_misc.h * @brief Define the host data path miscelleneous API functions diff --git a/dp/inc/cdp_txrx_mon.h b/dp/inc/cdp_txrx_mon.h index 83349c309672..a7efeb7092d0 100644 --- a/dp/inc/cdp_txrx_mon.h +++ b/dp/inc/cdp_txrx_mon.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ /** * @file cdp_txrx_mon.h * @brief Define the monitor mode API functions diff --git a/dp/inc/cdp_txrx_ocb.h b/dp/inc/cdp_txrx_ocb.h index 074637a263d5..06a9be835455 100644 --- a/dp/inc/cdp_txrx_ocb.h +++ b/dp/inc/cdp_txrx_ocb.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2016 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef _CDP_TXRX_OCB_H_ #define _CDP_TXRX_OCB_H_ diff --git a/dp/inc/cdp_txrx_peer_ops.h b/dp/inc/cdp_txrx_peer_ops.h index 957b3da76511..ec5bbf0a7488 100644 --- a/dp/inc/cdp_txrx_peer_ops.h +++ b/dp/inc/cdp_txrx_peer_ops.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ /** * @file cdp_txrx_peer.h * @brief Define the host data path peer API functions diff --git a/dp/inc/cdp_txrx_pflow.h b/dp/inc/cdp_txrx_pflow.h index 971e16619d05..ef6c74ad1f26 100644 --- a/dp/inc/cdp_txrx_pflow.h +++ b/dp/inc/cdp_txrx_pflow.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ /** * @file cdp_txrx_pflow.h * @brief Define the host data path peer flow API functions diff --git a/dp/inc/cdp_txrx_pmf.h b/dp/inc/cdp_txrx_pmf.h index 42218c77cf90..3feb92b9839d 100644 --- a/dp/inc/cdp_txrx_pmf.h +++ b/dp/inc/cdp_txrx_pmf.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2016 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ #ifndef _CDP_TXRX_PMF_H_ #define _CDP_TXRX_PMF_H_ diff --git a/dp/inc/cdp_txrx_raw.h b/dp/inc/cdp_txrx_raw.h index 3fd6e71863b2..227214130aa3 100644 --- a/dp/inc/cdp_txrx_raw.h +++ b/dp/inc/cdp_txrx_raw.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ /** * @file cdp_txrx_raw.h * @brief Define the host data path raw mode API functions diff --git a/dp/inc/cdp_txrx_stats.h b/dp/inc/cdp_txrx_stats.h index 20643d92a6e4..d421a5590b08 100644 --- a/dp/inc/cdp_txrx_stats.h +++ b/dp/inc/cdp_txrx_stats.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ /** * @file cdp_txrx_stats.h * @brief Define the host data path statistics API functions diff --git a/dp/inc/cdp_txrx_stats_struct.h b/dp/inc/cdp_txrx_stats_struct.h index aa70e6aadc9c..731fd4508992 100644 --- a/dp/inc/cdp_txrx_stats_struct.h +++ b/dp/inc/cdp_txrx_stats_struct.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ /** * @file cdp_txrx_stats_struct.h * @brief Define the host data path stats API functions diff --git a/dp/inc/cdp_txrx_tx_delay.h b/dp/inc/cdp_txrx_tx_delay.h index 559fb46e1644..ad2a897d0645 100644 --- a/dp/inc/cdp_txrx_tx_delay.h +++ b/dp/inc/cdp_txrx_tx_delay.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ /** * @file cdp_txrx_tx_delay.h * @brief Define the host data path histogram API functions diff --git a/dp/inc/cdp_txrx_tx_throttle.h b/dp/inc/cdp_txrx_tx_throttle.h index 07e9a32d963c..0f8a9695dc81 100644 --- a/dp/inc/cdp_txrx_tx_throttle.h +++ b/dp/inc/cdp_txrx_tx_throttle.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ /** * @file cdp_txrx_tx_throttle.h * @brief Define the host data path transmit throttle API diff --git a/dp/inc/cdp_txrx_wds.h b/dp/inc/cdp_txrx_wds.h index 17c8b2711f64..ca3cf9b5cc12 100644 --- a/dp/inc/cdp_txrx_wds.h +++ b/dp/inc/cdp_txrx_wds.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ /** * @file cdp_txrx_wds.h * @brief Define the host data path WDS API functions diff --git a/hif/inc/hif.h b/hif/inc/hif.h index 14d61b721260..9d4aae5a8dba 100644 --- a/hif/inc/hif.h +++ b/hif/inc/hif.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef _HIF_H_ #define _HIF_H_ diff --git a/hif/inc/hif_napi.h b/hif/inc/hif_napi.h index dab7876932b2..4740c4bfaf39 100644 --- a/hif/inc/hif_napi.h +++ b/hif/inc/hif_napi.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2015-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef __HIF_NAPI_H__ #define __HIF_NAPI_H__ diff --git a/hif/inc/regtable.h b/hif/inc/regtable.h index fe460499022f..31cc83609cfe 100644 --- a/hif/inc/regtable.h +++ b/hif/inc/regtable.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef _REGTABLE_H_ #define _REGTABLE_H_ diff --git a/hif/inc/regtable_pcie.h b/hif/inc/regtable_pcie.h index 8d02bba90882..048a33c2c2f4 100644 --- a/hif/inc/regtable_pcie.h +++ b/hif/inc/regtable_pcie.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2011-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef _REGTABLE_PCIE_H_ #define _REGTABLE_PCIE_H_ diff --git a/hif/src/adrastea_reg_def.h b/hif/src/adrastea_reg_def.h index a9cd309a3c21..ab399fed8698 100644 --- a/hif/src/adrastea_reg_def.h +++ b/hif/src/adrastea_reg_def.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef ADRASTEA_REG_DEF_H #define ADRASTEA_REG_DEF_H diff --git a/hif/src/ar6320def.h b/hif/src/ar6320def.h index 168333f8eaf1..77ab1c527225 100644 --- a/hif/src/ar6320def.h +++ b/hif/src/ar6320def.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2011-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef _AR6320DEF_H_ #define _AR6320DEF_H_ diff --git a/hif/src/ar6320v2def.h b/hif/src/ar6320v2def.h index 910815544f3c..5ad0b98fd4ab 100644 --- a/hif/src/ar6320v2def.h +++ b/hif/src/ar6320v2def.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef _AR6320V2DEF_H_ #define _AR6320V2DEF_H_ diff --git a/hif/src/ar9888def.h b/hif/src/ar9888def.h index 1ebe643d746e..b0af2aeb2c26 100644 --- a/hif/src/ar9888def.h +++ b/hif/src/ar9888def.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2011-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef _AR9888DEF_H_ #define _AR9888DEF_H_ diff --git a/hif/src/ath_procfs.c b/hif/src/ath_procfs.c index 30a87087b962..f4c62b42a3e7 100644 --- a/hif/src/ath_procfs.c +++ b/hif/src/ath_procfs.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2014, 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #if defined(CONFIG_ATH_PROCFS_DIAG_SUPPORT) #include <linux/module.h> /* Specifically, a module */ #include <linux/kernel.h> /* We're doing kernel work */ diff --git a/hif/src/ce/ce_api.h b/hif/src/ce/ce_api.h index 68ef7963c638..814ddac1880b 100644 --- a/hif/src/ce/ce_api.h +++ b/hif/src/ce/ce_api.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef __COPY_ENGINE_API_H__ #define __COPY_ENGINE_API_H__ diff --git a/hif/src/ce/ce_assignment.h b/hif/src/ce/ce_assignment.h index d0b6d8702234..b402a7e4b33d 100644 --- a/hif/src/ce/ce_assignment.h +++ b/hif/src/ce/ce_assignment.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -20,12 +17,6 @@ */ /* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/* * Implementation of the Host-side Host InterFace (HIF) API * for a Host/Target interconnect using Copy Engines over PCIe. */ diff --git a/hif/src/ce/ce_bmi.c b/hif/src/ce/ce_bmi.c index e5124da8702e..1af759edf7c5 100644 --- a/hif/src/ce/ce_bmi.c +++ b/hif/src/ce/ce_bmi.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2015-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #include "targcfg.h" #include "qdf_lock.h" #include "qdf_status.h" diff --git a/hif/src/ce/ce_bmi.h b/hif/src/ce/ce_bmi.h index 1fb7c83a97df..7d330cb1a268 100644 --- a/hif/src/ce/ce_bmi.h +++ b/hif/src/ce/ce_bmi.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2015 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef __CE_BMI_H__ #define __CE_BMI_H__ diff --git a/hif/src/ce/ce_diag.c b/hif/src/ce/ce_diag.c index 39ba091948d6..8410b0c639f9 100644 --- a/hif/src/ce/ce_diag.c +++ b/hif/src/ce/ce_diag.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2015-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #include "targcfg.h" #include "qdf_lock.h" #include "qdf_status.h" diff --git a/hif/src/ce/ce_internal.h b/hif/src/ce/ce_internal.h index 137e5f9a87ef..abc6b5875b50 100644 --- a/hif/src/ce/ce_internal.h +++ b/hif/src/ce/ce_internal.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ #ifndef __COPY_ENGINE_INTERNAL_H__ #define __COPY_ENGINE_INTERNAL_H__ diff --git a/hif/src/ce/ce_main.c b/hif/src/ce/ce_main.c index 29c5963f6d51..6fbd121cd1ac 100644 --- a/hif/src/ce/ce_main.c +++ b/hif/src/ce/ce_main.c @@ -1,8 +1,5 @@ /* - * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * + * Copyright (c) 2013-2018 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ #include "targcfg.h" #include "qdf_lock.h" #include "qdf_status.h" @@ -132,7 +124,7 @@ void hif_trigger_dump(struct hif_opaque_softc *hif_ctx, } } -static void ce_poll_timeout(void *arg) +static void ce_poll_timeout(unsigned long arg) { struct CE_state *CE_state = (struct CE_state *)arg; diff --git a/hif/src/ce/ce_main.h b/hif/src/ce/ce_main.h index 186180382893..d4e8d5400f86 100644 --- a/hif/src/ce/ce_main.h +++ b/hif/src/ce/ce_main.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2015-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef __CE_H__ #define __CE_H__ diff --git a/hif/src/ce/ce_reg.h b/hif/src/ce/ce_reg.h index ceaeea0acfb5..b7f2d23a8eb3 100644 --- a/hif/src/ce/ce_reg.h +++ b/hif/src/ce/ce_reg.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2015-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef __CE_REG_H__ #define __CE_REG_H__ diff --git a/hif/src/ce/ce_service.c b/hif/src/ce/ce_service.c index 222cebf8f521..2500829a4a26 100644 --- a/hif/src/ce/ce_service.c +++ b/hif/src/ce/ce_service.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #include "hif.h" #include "hif_io32.h" #include "ce_api.h" diff --git a/hif/src/ce/ce_tasklet.c b/hif/src/ce/ce_tasklet.c index b0b38ac75229..625bbc776d0c 100644 --- a/hif/src/ce/ce_tasklet.c +++ b/hif/src/ce/ce_tasklet.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2015-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #include <linux/pci.h> #include <linux/slab.h> #include <linux/interrupt.h> diff --git a/hif/src/ce/ce_tasklet.h b/hif/src/ce/ce_tasklet.h index a6fbdfd84856..93287ae6cfc2 100644 --- a/hif/src/ce/ce_tasklet.h +++ b/hif/src/ce/ce_tasklet.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef __CE_TASKLET_H__ #define __CE_TASKLET_H__ #include "ce_main.h" diff --git a/hif/src/dispatcher/dummy.c b/hif/src/dispatcher/dummy.c index 45380807b3c7..d544423a5e69 100644 --- a/hif/src/dispatcher/dummy.c +++ b/hif/src/dispatcher/dummy.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #include "qdf_types.h" #include "dummy.h" #include "hif_debug.h" diff --git a/hif/src/dispatcher/dummy.h b/hif/src/dispatcher/dummy.h index b82957a206bb..bb3cc89b85d6 100644 --- a/hif/src/dispatcher/dummy.h +++ b/hif/src/dispatcher/dummy.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ struct hif_softc; void hif_dummy_bus_prevent_linkdown(struct hif_softc *scn, bool flag); diff --git a/hif/src/dispatcher/multibus.c b/hif/src/dispatcher/multibus.c index f65479cf15f2..7986d5950e9c 100644 --- a/hif/src/dispatcher/multibus.c +++ b/hif/src/dispatcher/multibus.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,13 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - - /* this file dispatches functions to bus specific definitions */ #include "hif_debug.h" #include "hif.h" diff --git a/hif/src/dispatcher/multibus.h b/hif/src/dispatcher/multibus.h index cd46b2cc2440..c4ceeaf67292 100644 --- a/hif/src/dispatcher/multibus.h +++ b/hif/src/dispatcher/multibus.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef _MULTIBUS_H_ #define _MULTIBUS_H_ diff --git a/hif/src/dispatcher/multibus_pci.c b/hif/src/dispatcher/multibus_pci.c index 2dd5f6d1e751..6158723e7336 100644 --- a/hif/src/dispatcher/multibus_pci.c +++ b/hif/src/dispatcher/multibus_pci.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #include "hif.h" #include "hif_main.h" #include "multibus.h" diff --git a/hif/src/dispatcher/multibus_snoc.c b/hif/src/dispatcher/multibus_snoc.c index 01c4da1eecfa..dd7f0e84bd94 100644 --- a/hif/src/dispatcher/multibus_snoc.c +++ b/hif/src/dispatcher/multibus_snoc.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #include "hif.h" #include "hif_main.h" #include "multibus.h" diff --git a/hif/src/dispatcher/pci_api.h b/hif/src/dispatcher/pci_api.h index 57c4e66a35c9..39cee8bda80b 100644 --- a/hif/src/dispatcher/pci_api.h +++ b/hif/src/dispatcher/pci_api.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ #ifndef _PCI_API_H_ #define _PCI_API_H_ QDF_STATUS hif_pci_open(struct hif_softc *hif_ctx, diff --git a/hif/src/dispatcher/snoc_api.h b/hif/src/dispatcher/snoc_api.h index 1d2c54e308a1..1e52abb6da7c 100644 --- a/hif/src/dispatcher/snoc_api.h +++ b/hif/src/dispatcher/snoc_api.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef _SNOC_API_H_ #define _SNOC_API_H_ QDF_STATUS hif_snoc_open(struct hif_softc *hif_ctx, diff --git a/hif/src/hif_debug.h b/hif/src/hif_debug.h index dc687aa7e1ba..eed900c88342 100644 --- a/hif/src/hif_debug.h +++ b/hif/src/hif_debug.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2014, 2016, 2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 diff --git a/hif/src/hif_hw_version.h b/hif/src/hif_hw_version.h index 1d392e29822c..8487d1d69e6c 100644 --- a/hif/src/hif_hw_version.h +++ b/hif/src/hif_hw_version.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,13 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - - #ifndef HIF_HW_VERSION_H #define HIF_HW_VERSION_H diff --git a/hif/src/hif_io32.h b/hif/src/hif_io32.h index fa4fca962d91..3608b1e5ac8e 100644 --- a/hif/src/hif_io32.h +++ b/hif/src/hif_io32.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2015-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef __HIF_IO32_H__ #define __HIF_IO32_H__ diff --git a/hif/src/hif_main.c b/hif/src/hif_main.c index 8a4e54c6167d..94f9c70593bf 100644 --- a/hif/src/hif_main.c +++ b/hif/src/hif_main.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2015-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #include "targcfg.h" #include "qdf_lock.h" #include "qdf_status.h" diff --git a/hif/src/hif_main.h b/hif/src/hif_main.h index 9d286a27757b..3cf44509da35 100644 --- a/hif/src/hif_main.h +++ b/hif/src/hif_main.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -20,12 +17,6 @@ */ /* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/* * NB: Inappropriate references to "HTC" are used in this (and other) * HIF implementations. HTC is typically the calling layer, but it * theoretically could be some alternative. diff --git a/hif/src/hif_napi.c b/hif/src/hif_napi.c index a854172c0b36..bf4e241b834c 100644 --- a/hif/src/hif_napi.c +++ b/hif/src/hif_napi.c @@ -1,8 +1,5 @@ /* - * Copyright (c) 2015-2017 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * + * Copyright (c) 2015-2018 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: hif_napi.c * @@ -1192,6 +1183,7 @@ static int hnc_cpu_notify_cb(struct notifier_block *nb, switch (action) { case CPU_ONLINE: + case CPU_ONLINE_FROZEN: napid->napi_cpu[cpu].state = QCA_NAPI_CPU_UP; NAPI_DEBUG("%s: CPU %ld marked %d", __func__, cpu, napid->napi_cpu[cpu].state); diff --git a/hif/src/mp_dev.c b/hif/src/mp_dev.c index d6b15f72e8d8..c8db5d888cf8 100644 --- a/hif/src/mp_dev.c +++ b/hif/src/mp_dev.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2014, 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #include "hif_io32.h" #include "hif_debug.h" #include "mp_dev.h" diff --git a/hif/src/mp_dev.h b/hif/src/mp_dev.h index c09eabcab731..208c911b57c8 100644 --- a/hif/src/mp_dev.h +++ b/hif/src/mp_dev.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef __MP_DEV_H__ #define __MP_DEV_H__ void priv_start_agc(struct hif_softc *scn); diff --git a/hif/src/pcie/hif_io32_pci.h b/hif/src/pcie/hif_io32_pci.h index d1bf2759acde..0d26bb6d2530 100644 --- a/hif/src/pcie/hif_io32_pci.h +++ b/hif/src/pcie/hif_io32_pci.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef __HIF_IO32_PCI_H__ #define __HIF_IO32_PCI_H__ diff --git a/hif/src/pcie/if_pci.c b/hif/src/pcie/if_pci.c index 1b08f8e7d035..8ee5c510bbc9 100644 --- a/hif/src/pcie/if_pci.c +++ b/hif/src/pcie/if_pci.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #include <linux/pci.h> #include <linux/slab.h> #include <linux/interrupt.h> @@ -1488,7 +1479,7 @@ static void soc_wake_reset(struct hif_softc *scn) * allow the target to go to sleep and cancel the sleep timer. * otherwise reschedule the sleep timer. */ -static void hif_sleep_entry(void *arg) +static void hif_sleep_entry(unsigned long arg) { struct HIF_CE_state *hif_state = (struct HIF_CE_state *)arg; struct hif_softc *scn = HIF_GET_SOFTC(hif_state); diff --git a/hif/src/pcie/if_pci.h b/hif/src/pcie/if_pci.h index 3a42a4a532ee..892ce8790f6b 100644 --- a/hif/src/pcie/if_pci.h +++ b/hif/src/pcie/if_pci.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef __ATH_PCI_H__ #define __ATH_PCI_H__ diff --git a/hif/src/pcie/if_pci_internal.h b/hif/src/pcie/if_pci_internal.h index b280f2be553e..f15b03b4fd84 100644 --- a/hif/src/pcie/if_pci_internal.h +++ b/hif/src/pcie/if_pci_internal.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef __IF_PCI_INTERNAL_H__ #define __IF_PCI_INTERNAL_H__ diff --git a/hif/src/regtable.c b/hif/src/regtable.c index 19ede4afe9ba..4704f8defbf0 100644 --- a/hif/src/regtable.c +++ b/hif/src/regtable.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #include "targaddrs.h" #include "cepci.h" #include "regtable.h" diff --git a/hif/src/sdio/hif_bmi_reg_access.c b/hif/src/sdio/hif_bmi_reg_access.c index 390d78e28aa5..3c4456f92b07 100644 --- a/hif/src/sdio/hif_bmi_reg_access.c +++ b/hif/src/sdio/hif_bmi_reg_access.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. * - ***Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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. @@ -17,12 +14,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #include "athdefs.h" #include "a_types.h" #include "a_osapi.h" diff --git a/hif/src/sdio/hif_diag_reg_access.c b/hif/src/sdio/hif_diag_reg_access.c index 3d1ea21747d6..94d73873831d 100644 --- a/hif/src/sdio/hif_diag_reg_access.c +++ b/hif/src/sdio/hif_diag_reg_access.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #include "athdefs.h" #include "a_types.h" #include "a_osapi.h" diff --git a/hif/src/sdio/hif_sdio.c b/hif/src/sdio/hif_sdio.c index dbacbd8a8218..896dff6689b1 100644 --- a/hif/src/sdio/hif_sdio.c +++ b/hif/src/sdio/hif_sdio.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #include <qdf_types.h> #include <qdf_status.h> #include <qdf_timer.h> diff --git a/hif/src/sdio/hif_sdio_common.h b/hif/src/sdio/hif_sdio_common.h index 81022910fff7..ad1088973c86 100644 --- a/hif/src/sdio/hif_sdio_common.h +++ b/hif/src/sdio/hif_sdio_common.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,13 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - - #ifndef _HIF_SDIO_COMMON_H_ #define _HIF_SDIO_COMMON_H_ diff --git a/hif/src/sdio/hif_sdio_dev.c b/hif/src/sdio/hif_sdio_dev.c index a85a48a92a8b..1aa7f1346cda 100644 --- a/hif/src/sdio/hif_sdio_dev.c +++ b/hif/src/sdio/hif_sdio_dev.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #define ATH_MODULE_NAME hif #include "a_debug.h" diff --git a/hif/src/sdio/hif_sdio_dev.h b/hif/src/sdio/hif_sdio_dev.h index e639febf2762..6dc6aaacadcb 100644 --- a/hif/src/sdio/hif_sdio_dev.h +++ b/hif/src/sdio/hif_sdio_dev.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef HIF_SDIO_DEV_H_ #define HIF_SDIO_DEV_H_ diff --git a/hif/src/sdio/hif_sdio_internal.h b/hif/src/sdio/hif_sdio_internal.h index d90a7175b006..fb0d76844eab 100644 --- a/hif/src/sdio/hif_sdio_internal.h +++ b/hif/src/sdio/hif_sdio_internal.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2014, 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef _HIF_SDIO_INTERNAL_H_ #define _HIF_SDIO_INTERNAL_H_ diff --git a/hif/src/sdio/hif_sdio_recv.c b/hif/src/sdio/hif_sdio_recv.c index 408be56950a6..fa4ffddd5226 100644 --- a/hif/src/sdio/hif_sdio_recv.c +++ b/hif/src/sdio/hif_sdio_recv.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #define ATH_MODULE_NAME hif #include <qdf_types.h> #include <qdf_status.h> diff --git a/hif/src/sdio/hif_sdio_send.c b/hif/src/sdio/hif_sdio_send.c index cd0ab2985c87..3ac260edbada 100644 --- a/hif/src/sdio/hif_sdio_send.c +++ b/hif/src/sdio/hif_sdio_send.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #define ATH_MODULE_NAME hif #include <qdf_types.h> #include <qdf_status.h> diff --git a/hif/src/sdio/if_sdio.c b/hif/src/sdio/if_sdio.c index cfa7e7813737..d5bc45800902 100644 --- a/hif/src/sdio/if_sdio.c +++ b/hif/src/sdio/if_sdio.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef EXPORT_SYMTAB #define EXPORT_SYMTAB #endif diff --git a/hif/src/sdio/if_sdio.h b/hif/src/sdio/if_sdio.h index 08ee7e3a7fbd..f745334d964d 100644 --- a/hif/src/sdio/if_sdio.h +++ b/hif/src/sdio/if_sdio.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef __IF_SDIO_H__ #define __IF_SDIO_H__ diff --git a/hif/src/sdio/native_sdio/include/hif_internal.h b/hif/src/sdio/native_sdio/include/hif_internal.h index ae58503dcdb0..0a5848cee50a 100644 --- a/hif/src/sdio/native_sdio/include/hif_internal.h +++ b/hif/src/sdio/native_sdio/include/hif_internal.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef _HIF_INTERNAL_H_ #define _HIF_INTERNAL_H_ diff --git a/hif/src/sdio/native_sdio/src/hif.c b/hif/src/sdio/native_sdio/src/hif.c index e43ce073a534..e7fd98d8ddff 100644 --- a/hif/src/sdio/native_sdio/src/hif.c +++ b/hif/src/sdio/native_sdio/src/hif.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #include <linux/mmc/card.h> #include <linux/mmc/mmc.h> #include <linux/mmc/host.h> diff --git a/hif/src/sdio/native_sdio/src/hif_scatter.c b/hif/src/sdio/native_sdio/src/hif_scatter.c index 85fa0fea7db5..fb135b392887 100644 --- a/hif/src/sdio/native_sdio/src/hif_scatter.c +++ b/hif/src/sdio/native_sdio/src/hif_scatter.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #include <linux/mmc/card.h> #include <linux/mmc/host.h> #include <linux/mmc/sdio_func.h> diff --git a/hif/src/sdio/regtable_sdio.c b/hif/src/sdio/regtable_sdio.c index 83108dbc8084..ca8ab8d5d7a7 100644 --- a/hif/src/sdio/regtable_sdio.c +++ b/hif/src/sdio/regtable_sdio.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #include "bmi_msg.h" #include "cepci.h" diff --git a/hif/src/sdio/regtable_sdio.h b/hif/src/sdio/regtable_sdio.h index d6b30fb16058..185d11bbf79c 100644 --- a/hif/src/sdio/regtable_sdio.h +++ b/hif/src/sdio/regtable_sdio.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ #ifndef _REGTABLE_SDIO_H_ #define _REGTABLE_SDIO_H_ diff --git a/hif/src/snoc/hif_io32_snoc.h b/hif/src/snoc/hif_io32_snoc.h index d046d883feb7..c38a73251fe9 100644 --- a/hif/src/snoc/hif_io32_snoc.h +++ b/hif/src/snoc/hif_io32_snoc.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2015-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: hif_io32_snoc.h * diff --git a/hif/src/snoc/if_snoc.c b/hif/src/snoc/if_snoc.c index 147c797fd950..0f5a4b78635f 100644 --- a/hif/src/snoc/if_snoc.c +++ b/hif/src/snoc/if_snoc.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2015-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: if_snoc.c * diff --git a/hif/src/usb/hif_usb.c b/hif/src/usb/hif_usb.c index ae2da748cebc..1f99722ebd5a 100644 --- a/hif/src/usb/hif_usb.c +++ b/hif/src/usb/hif_usb.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ #include <qdf_time.h> #include <qdf_lock.h> #include <qdf_mem.h> diff --git a/hif/src/usb/hif_usb_internal.h b/hif/src/usb/hif_usb_internal.h index 40ee48db3d81..bfccc528f4d5 100644 --- a/hif/src/usb/hif_usb_internal.h +++ b/hif/src/usb/hif_usb_internal.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ #ifndef _HIF_USB_INTERNAL_H #define _HIF_USB_INTERNAL_H diff --git a/hif/src/usb/if_usb.c b/hif/src/usb/if_usb.c index 176e1a0e3cae..58cac74cd314 100644 --- a/hif/src/usb/if_usb.c +++ b/hif/src/usb/if_usb.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #include <linux/usb.h> #include <linux/usb/hcd.h> #include "if_usb.h" diff --git a/hif/src/usb/if_usb.h b/hif/src/usb/if_usb.h index 7d05c567dfa4..dc0e7706dece 100644 --- a/hif/src/usb/if_usb.h +++ b/hif/src/usb/if_usb.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ #ifndef __ATH_USB_H__ #define __ATH_USB_H__ diff --git a/hif/src/usb/regtable_usb.c b/hif/src/usb/regtable_usb.c index 1e9ea190ed48..98c4215ce99c 100644 --- a/hif/src/usb/regtable_usb.c +++ b/hif/src/usb/regtable_usb.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #include "bmi_msg.h" #include "targaddrs.h" #include "regtable_usb.h" diff --git a/hif/src/usb/regtable_usb.h b/hif/src/usb/regtable_usb.h index 4d17bcc0d5e0..f3bf559c27e4 100644 --- a/hif/src/usb/regtable_usb.h +++ b/hif/src/usb/regtable_usb.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ #ifndef _REGTABLE_USB_H_ #define _REGTABLE_USB_H_ #include "if_usb.h" diff --git a/hif/src/usb/usbdrv.c b/hif/src/usb/usbdrv.c index e2d0935ee5ca..86031ca86a62 100644 --- a/hif/src/usb/usbdrv.c +++ b/hif/src/usb/usbdrv.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #define ATH_MODULE_NAME hif #include "a_debug.h" #include "hif_usb_internal.h" diff --git a/htc/dl_list.h b/htc/dl_list.h index be9970cf0a29..85b1b8542a4e 100644 --- a/htc/dl_list.h +++ b/htc/dl_list.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2014, 2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /*=========================================================================== */ /* Double-link list definitions (adapted from Atheros SDIO stack) */ /* */ diff --git a/htc/htc.c b/htc/htc.c index 8e73390a195f..178c530913d5 100644 --- a/htc/htc.c +++ b/htc/htc.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #include "htc_debug.h" #include "htc_internal.h" #include <hif.h> diff --git a/htc/htc_api.h b/htc/htc_api.h index 612d1ebb777d..c129f4295d0c 100644 --- a/htc/htc_api.h +++ b/htc/htc_api.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2014, 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef _HTC_API_H_ #define _HTC_API_H_ diff --git a/htc/htc_debug.h b/htc/htc_debug.h index c3c0a7ae8a4b..9ba247f7e394 100644 --- a/htc/htc_debug.h +++ b/htc/htc_debug.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2014 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef HTC_DEBUG_H_ #define HTC_DEBUG_H_ diff --git a/htc/htc_internal.h b/htc/htc_internal.h index 2c62c347aacb..35f8af1bc38d 100644 --- a/htc/htc_internal.h +++ b/htc/htc_internal.h @@ -1,8 +1,5 @@ /* - * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * + * Copyright (c) 2013-2018 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef _HTC_INTERNAL_H_ #define _HTC_INTERNAL_H_ @@ -315,7 +306,7 @@ void htc_process_credit_rpt(HTC_TARGET *target, HTC_CREDIT_REPORT *pRpt, int NumEntries, HTC_ENDPOINT_ID FromEndpoint); void htc_fw_event_handler(void *context, QDF_STATUS status); -void htc_send_complete_check_cleanup(void *context); +void htc_send_complete_check_cleanup(unsigned long context); #ifdef FEATURE_RUNTIME_PM void htc_kick_queues(void *context); #endif diff --git a/htc/htc_packet.h b/htc/htc_packet.h index 6eb8205df171..a205ae454c36 100644 --- a/htc/htc_packet.h +++ b/htc/htc_packet.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2014, 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef HTC_PACKET_H_ #define HTC_PACKET_H_ diff --git a/htc/htc_recv.c b/htc/htc_recv.c index ca32848da19a..e76dea089b8d 100644 --- a/htc/htc_recv.c +++ b/htc/htc_recv.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #include "htc_debug.h" #include "htc_internal.h" #include <qdf_nbuf.h> /* qdf_nbuf_t */ diff --git a/htc/htc_send.c b/htc/htc_send.c index 7ce336e97422..4b9dbd6e714d 100644 --- a/htc/htc_send.c +++ b/htc/htc_send.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #include "htc_debug.h" #include "htc_internal.h" #include <qdf_mem.h> /* qdf_mem_malloc */ @@ -210,7 +201,7 @@ static void send_packet_completion(HTC_TARGET *target, HTC_PACKET *pPacket) } -void htc_send_complete_check_cleanup(void *context) +void htc_send_complete_check_cleanup(unsigned long context) { HTC_ENDPOINT *pEndpoint = (HTC_ENDPOINT *) context; diff --git a/htc/htc_services.c b/htc/htc_services.c index 173ae3f66a9e..13b3b3da0e30 100644 --- a/htc/htc_services.c +++ b/htc/htc_services.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #include "htc_debug.h" #include "htc_internal.h" #include <hif.h> diff --git a/qdf/inc/osdep.h b/qdf/inc/osdep.h index 70cc94c29a7d..67ba026f54c4 100644 --- a/qdf/inc/osdep.h +++ b/qdf/inc/osdep.h @@ -1,8 +1,5 @@ /* - * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * + * Copyright (c) 2013-2018 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: osdep * This file provides OS abstraction for osdependent APIs. @@ -161,7 +152,7 @@ static inline unsigned char *os_malloc(osdev_t nic_dev, * different argument types for timer function in different OS. */ #define os_timer_func(_fn) \ - void _fn(void *timer_arg) + void _fn(unsigned long timer_arg) #define OS_GET_TIMER_ARG(_arg, _type) \ ((_arg) = (_type)(timer_arg)) diff --git a/qdf/inc/qdf_atomic.h b/qdf/inc/qdf_atomic.h index 39c09d14af81..76285675a5a8 100644 --- a/qdf/inc/qdf_atomic.h +++ b/qdf/inc/qdf_atomic.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: qdf_atomic.h * This file provides OS abstraction for atomic APIs. diff --git a/qdf/inc/qdf_defer.h b/qdf/inc/qdf_defer.h index da3b939134b2..c103119d47c7 100644 --- a/qdf/inc/qdf_defer.h +++ b/qdf/inc/qdf_defer.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: qdf_defer.h * This file abstracts deferred execution API's. diff --git a/qdf/inc/qdf_event.h b/qdf/inc/qdf_event.h index c1825c85b0be..f784616a1fb9 100644 --- a/qdf/inc/qdf_event.h +++ b/qdf/inc/qdf_event.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: qdf_event.h * This file provides OS abstraction for event APIs. diff --git a/qdf/inc/qdf_list.h b/qdf/inc/qdf_list.h index 171bb3270d3f..219d31201afe 100644 --- a/qdf/inc/qdf_list.h +++ b/qdf/inc/qdf_list.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,13 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - - /** * DOC: qdf_list.h * QCA driver framework (QDF) list APIs diff --git a/qdf/inc/qdf_lock.h b/qdf/inc/qdf_lock.h index 19a474cc56ac..e512cb2c1b3c 100644 --- a/qdf/inc/qdf_lock.h +++ b/qdf/inc/qdf_lock.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * @file qdf_lock.h * This file abstracts locking operations. diff --git a/qdf/inc/qdf_mc_timer.h b/qdf/inc/qdf_mc_timer.h index dfccd985cfea..399cb728569a 100644 --- a/qdf/inc/qdf_mc_timer.h +++ b/qdf/inc/qdf_mc_timer.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: qdf_mc_timer * QCA driver framework timer APIs serialized to MC thread diff --git a/qdf/inc/qdf_mem.h b/qdf/inc/qdf_mem.h index 8d1938642924..57eb58ac9fbb 100644 --- a/qdf/inc/qdf_mem.h +++ b/qdf/inc/qdf_mem.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: qdf_mem * QCA driver framework (QDF) memory management APIs diff --git a/qdf/inc/qdf_module.h b/qdf/inc/qdf_module.h index 23e13eecf4db..cb78b10fd6dd 100644 --- a/qdf/inc/qdf_module.h +++ b/qdf/inc/qdf_module.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2010-2016 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * @file qdf_module.h * This file abstracts "kernel module" semantics. diff --git a/qdf/inc/qdf_nbuf.h b/qdf/inc/qdf_nbuf.h index e7f7578a535a..b92c05521b0f 100644 --- a/qdf/inc/qdf_nbuf.h +++ b/qdf/inc/qdf_nbuf.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: qdf_nbuf_public network buffer API * This file defines the network buffer abstraction. diff --git a/qdf/inc/qdf_net_types.h b/qdf/inc/qdf_net_types.h index b31d6f0084b5..c501418af744 100644 --- a/qdf/inc/qdf_net_types.h +++ b/qdf/inc/qdf_net_types.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: qdf_net_types * This file defines types used in the networking stack abstraction. diff --git a/qdf/inc/qdf_perf.h b/qdf/inc/qdf_perf.h index 4350dcc51dee..aad7982c77f2 100644 --- a/qdf/inc/qdf_perf.h +++ b/qdf/inc/qdf_perf.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: qdf_perf * This file provides OS abstraction perf API's. diff --git a/qdf/inc/qdf_status.h b/qdf/inc/qdf_status.h index 0a58c4eb4843..3cb90e250cba 100644 --- a/qdf/inc/qdf_status.h +++ b/qdf/inc/qdf_status.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: qdf_status * QCA driver framework (QDF) status codes diff --git a/qdf/inc/qdf_threads.h b/qdf/inc/qdf_threads.h index 6e238b7c1faa..f2c3542fc49f 100644 --- a/qdf/inc/qdf_threads.h +++ b/qdf/inc/qdf_threads.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: qdf_threads * QCA driver framework (QDF) thread related APIs diff --git a/qdf/inc/qdf_time.h b/qdf/inc/qdf_time.h index edfb40513a3a..e84f958dd232 100644 --- a/qdf/inc/qdf_time.h +++ b/qdf/inc/qdf_time.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: qdf_time * This file abstracts time related functionality. diff --git a/qdf/inc/qdf_timer.h b/qdf/inc/qdf_timer.h index 32afd2587ff5..ad9ae0d73807 100644 --- a/qdf/inc/qdf_timer.h +++ b/qdf/inc/qdf_timer.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: qdf_timer * This file abstracts OS timers running in soft IRQ context. diff --git a/qdf/inc/qdf_trace.h b/qdf/inc/qdf_trace.h index 7d6b1b45f225..599bebdffe82 100644 --- a/qdf/inc/qdf_trace.h +++ b/qdf/inc/qdf_trace.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #if !defined(__QDF_TRACE_H) #define __QDF_TRACE_H diff --git a/qdf/inc/qdf_types.h b/qdf/inc/qdf_types.h index 9cf451ced8eb..cb6b2d337393 100644 --- a/qdf/inc/qdf_types.h +++ b/qdf/inc/qdf_types.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: qdf_types.h * QCA driver framework (QDF) basic type definitions @@ -242,7 +233,7 @@ typedef void (*qdf_defer_fn_t)(void *); typedef bool (*qdf_irqlocked_func_t)(void *); /* Prototype of timer function */ -typedef void (*qdf_timer_func_t)(void *); +typedef void (*qdf_timer_func_t)(unsigned long); #define qdf_offsetof(type, field) offsetof(type, field) diff --git a/qdf/inc/qdf_util.h b/qdf/inc/qdf_util.h index d3059cd10f88..0f6301f87bdd 100644 --- a/qdf/inc/qdf_util.h +++ b/qdf/inc/qdf_util.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: qdf_util.h * This file defines utility functions. diff --git a/qdf/linux/src/i_osdep.h b/qdf/linux/src/i_osdep.h index 30ffa66e00e1..02d2e8ac6523 100644 --- a/qdf/linux/src/i_osdep.h +++ b/qdf/linux/src/i_osdep.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: i_osdep * QCA driver framework OS dependent types diff --git a/qdf/linux/src/i_qdf_atomic.h b/qdf/linux/src/i_qdf_atomic.h index 4d5f5eb30bd3..8e7110b52e64 100644 --- a/qdf/linux/src/i_qdf_atomic.h +++ b/qdf/linux/src/i_qdf_atomic.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: i_qdf_atomic.h * This file provides OS dependent atomic APIs. diff --git a/qdf/linux/src/i_qdf_defer.h b/qdf/linux/src/i_qdf_defer.h index 5a1bcda6218c..53edbd6cba7b 100644 --- a/qdf/linux/src/i_qdf_defer.h +++ b/qdf/linux/src/i_qdf_defer.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: i_qdf_defer.h * This file provides OS dependent deferred API's. diff --git a/qdf/linux/src/i_qdf_event.h b/qdf/linux/src/i_qdf_event.h index 9add68850c3e..41726f934dc1 100644 --- a/qdf/linux/src/i_qdf_event.h +++ b/qdf/linux/src/i_qdf_event.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: i_qdf_event.h * This file provides OS dependent event API's. diff --git a/qdf/linux/src/i_qdf_list.h b/qdf/linux/src/i_qdf_list.h index 23cef762313f..6588cbfe64c4 100644 --- a/qdf/linux/src/i_qdf_list.h +++ b/qdf/linux/src/i_qdf_list.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: i_qdf_list.h * This file provides OS dependent list API's. diff --git a/qdf/linux/src/i_qdf_lock.h b/qdf/linux/src/i_qdf_lock.h index eea7867f3799..c1f4fca75321 100644 --- a/qdf/linux/src/i_qdf_lock.h +++ b/qdf/linux/src/i_qdf_lock.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: i_qdf_lock.h * Linux-specific definitions for QDF Lock API's diff --git a/qdf/linux/src/i_qdf_mc_timer.h b/qdf/linux/src/i_qdf_mc_timer.h index f7d6df7ad18e..e0ccaf9ad2bd 100644 --- a/qdf/linux/src/i_qdf_mc_timer.h +++ b/qdf/linux/src/i_qdf_mc_timer.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: i_qdf_mc_timer.h * Linux-specific definitions for QDF timers serialized to MC thread diff --git a/qdf/linux/src/i_qdf_mem.h b/qdf/linux/src/i_qdf_mem.h index 675110c90043..5634a12673ef 100644 --- a/qdf/linux/src/i_qdf_mem.h +++ b/qdf/linux/src/i_qdf_mem.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: i_qdf_mem.h * Linux-specific definitions for QDF memory API's diff --git a/qdf/linux/src/i_qdf_module.h b/qdf/linux/src/i_qdf_module.h index b5c1cb795c4e..be8c8e06b200 100644 --- a/qdf/linux/src/i_qdf_module.h +++ b/qdf/linux/src/i_qdf_module.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2010-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: i_qdf_module.h * Linux-specific definitions for QDF module API's diff --git a/qdf/linux/src/i_qdf_nbuf.h b/qdf/linux/src/i_qdf_nbuf.h index fe9602e423aa..13462d7d111e 100644 --- a/qdf/linux/src/i_qdf_nbuf.h +++ b/qdf/linux/src/i_qdf_nbuf.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: i_qdf_nbuf.h * This file provides OS dependent nbuf API's. diff --git a/qdf/linux/src/i_qdf_net_types.h b/qdf/linux/src/i_qdf_net_types.h index 0ec7d75fba96..ccca12646114 100644 --- a/qdf/linux/src/i_qdf_net_types.h +++ b/qdf/linux/src/i_qdf_net_types.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: i_qdf_net_types * This file provides OS dependent net types API's. diff --git a/qdf/linux/src/i_qdf_perf.h b/qdf/linux/src/i_qdf_perf.h index 4471860d96c4..a57e068b686c 100644 --- a/qdf/linux/src/i_qdf_perf.h +++ b/qdf/linux/src/i_qdf_perf.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2016 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: i_qdf_perf * This file provides OS dependent perf API's. diff --git a/qdf/linux/src/i_qdf_time.h b/qdf/linux/src/i_qdf_time.h index fddf36a3cbc8..6cc21897d55c 100644 --- a/qdf/linux/src/i_qdf_time.h +++ b/qdf/linux/src/i_qdf_time.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: i_qdf_time * This file provides OS dependent time API's. diff --git a/qdf/linux/src/i_qdf_timer.h b/qdf/linux/src/i_qdf_timer.h index 92695c7fdc3f..ea0256bc9578 100644 --- a/qdf/linux/src/i_qdf_timer.h +++ b/qdf/linux/src/i_qdf_timer.h @@ -1,8 +1,5 @@ /* - * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * + * Copyright (c) 2014-2018 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: i_qdf_timer * This file provides OS dependent timer API's. @@ -47,8 +38,6 @@ /* timer data type */ typedef struct timer_list __qdf_timer_t; -typedef void (*qdf_dummy_timer_func_t)(unsigned long arg); - /** * __qdf_timer_init() - initialize a softirq timer * @hdl: OS handle @@ -71,21 +60,16 @@ static inline QDF_STATUS __qdf_timer_init(qdf_handle_t hdl, { if (type == QDF_TIMER_TYPE_SW) { if (object_is_on_stack(timer)) - setup_deferrable_timer_on_stack( - timer, (qdf_dummy_timer_func_t)func, - (unsigned long)arg); + setup_deferrable_timer_on_stack(timer, func, + (unsigned long)arg); else - setup_deferrable_timer(timer, - (qdf_dummy_timer_func_t)func, + setup_deferrable_timer(timer, func, (unsigned long)arg); } else { if (object_is_on_stack(timer)) - setup_timer_on_stack(timer, - (qdf_dummy_timer_func_t)func, - (unsigned long)arg); + setup_timer_on_stack(timer, func, (unsigned long)arg); else - setup_timer(timer, (qdf_dummy_timer_func_t)func, - (unsigned long)arg); + setup_timer(timer, func, (unsigned long)arg); } return QDF_STATUS_SUCCESS; diff --git a/qdf/linux/src/i_qdf_trace.h b/qdf/linux/src/i_qdf_trace.h index ee35df45f88e..8b21cd7db0dd 100644 --- a/qdf/linux/src/i_qdf_trace.h +++ b/qdf/linux/src/i_qdf_trace.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: i_qdf_trace.h * diff --git a/qdf/linux/src/i_qdf_types.h b/qdf/linux/src/i_qdf_types.h index 81861ec1912f..f77a3c1822b9 100644 --- a/qdf/linux/src/i_qdf_types.h +++ b/qdf/linux/src/i_qdf_types.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: i_qdf_types.h * This file provides OS dependent types API's. diff --git a/qdf/linux/src/i_qdf_util.h b/qdf/linux/src/i_qdf_util.h index 5c220f6ba965..3732ad2d54e4 100644 --- a/qdf/linux/src/i_qdf_util.h +++ b/qdf/linux/src/i_qdf_util.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: i_qdf_util.h * This file provides OS dependent API's. diff --git a/qdf/linux/src/qdf_defer.c b/qdf/linux/src/qdf_defer.c index 434119081e94..40d10b47b179 100644 --- a/qdf/linux/src/qdf_defer.c +++ b/qdf/linux/src/qdf_defer.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: qdf_defer.c * This file provides OS dependent deferred API's. diff --git a/qdf/linux/src/qdf_event.c b/qdf/linux/src/qdf_event.c index 7ce21559ffc1..8a88a74d8138 100644 --- a/qdf/linux/src/qdf_event.c +++ b/qdf/linux/src/qdf_event.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: qdf_event.c * diff --git a/qdf/linux/src/qdf_list.c b/qdf/linux/src/qdf_list.c index d6363685ff5c..a80a7fb974e4 100644 --- a/qdf/linux/src/qdf_list.c +++ b/qdf/linux/src/qdf_list.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: qdf_list.c * diff --git a/qdf/linux/src/qdf_lock.c b/qdf/linux/src/qdf_lock.c index 85168cdb4b7f..ef2887d4c619 100644 --- a/qdf/linux/src/qdf_lock.c +++ b/qdf/linux/src/qdf_lock.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #include <linux/module.h> #include <qdf_lock.h> #include <qdf_trace.h> diff --git a/qdf/linux/src/qdf_mc_timer.c b/qdf/linux/src/qdf_mc_timer.c index 4e4c035a7eae..70b3ff8c2d6b 100644 --- a/qdf/linux/src/qdf_mc_timer.c +++ b/qdf/linux/src/qdf_mc_timer.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: qdf_mc_timer * QCA driver framework timer APIs serialized to MC thread diff --git a/qdf/linux/src/qdf_mem.c b/qdf/linux/src/qdf_mem.c index bbe45f5a4d65..b1162d7f495a 100644 --- a/qdf/linux/src/qdf_mem.c +++ b/qdf/linux/src/qdf_mem.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: qdf_mem * This file provides OS dependent memory management APIs diff --git a/qdf/linux/src/qdf_module.c b/qdf/linux/src/qdf_module.c index ce4db058d13c..a9c54222797f 100644 --- a/qdf/linux/src/qdf_module.c +++ b/qdf/linux/src/qdf_module.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: i_qdf_module.h * Linux-specific definitions for QDF module API's diff --git a/qdf/linux/src/qdf_nbuf.c b/qdf/linux/src/qdf_nbuf.c index 96c8eacc36f2..6606df6a4cbf 100644 --- a/qdf/linux/src/qdf_nbuf.c +++ b/qdf/linux/src/qdf_nbuf.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: qdf_nbuf.c * QCA driver framework(QDF) network buffer management APIs @@ -2334,9 +2325,20 @@ void qdf_net_buf_debug_release_skb(qdf_nbuf_t net_buf) qdf_nbuf_t next; next = qdf_nbuf_queue_next(ext_list); + + if (qdf_nbuf_is_tso(ext_list) && + qdf_nbuf_get_users(ext_list) > 1) { + ext_list = next; + continue; + } + qdf_net_buf_debug_delete_node(ext_list); ext_list = next; } + + if (qdf_nbuf_is_tso(net_buf) && qdf_nbuf_get_users(net_buf) > 1) + return; + qdf_net_buf_debug_delete_node(net_buf); } qdf_export_symbol(qdf_net_buf_debug_release_skb); diff --git a/qdf/linux/src/qdf_perf.c b/qdf/linux/src/qdf_perf.c index e7b2d5c86620..d3f3c80034f4 100644 --- a/qdf/linux/src/qdf_perf.c +++ b/qdf/linux/src/qdf_perf.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: qdf_perf * This file provides OS dependent perf API's. diff --git a/qdf/linux/src/qdf_threads.c b/qdf/linux/src/qdf_threads.c index 288601e449fc..74a1a953a478 100644 --- a/qdf/linux/src/qdf_threads.c +++ b/qdf/linux/src/qdf_threads.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: qdf_threads * QCA driver framework (QDF) thread APIs diff --git a/qdf/linux/src/qdf_trace.c b/qdf/linux/src/qdf_trace.c index 438d9e46aca5..7ab3839ef8bc 100644 --- a/qdf/linux/src/qdf_trace.c +++ b/qdf/linux/src/qdf_trace.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2014-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - /** * DOC: qdf_trace * QCA driver framework (QDF) trace APIs @@ -1240,12 +1231,10 @@ static bool qdf_dp_enable_check(qdf_nbuf_t nbuf, enum QDF_DP_TRACE_ID code, if (qdf_dp_trace_enable_track(code) == false) return false; - if (!nbuf) - return false; - - if ((QDF_NBUF_CB_TX_PACKET_TRACK(nbuf) != QDF_NBUF_TX_PKT_DATA_TRACK) || - ((dir == QDF_TX) && (QDF_NBUF_CB_TX_DP_TRACE(nbuf) == 0)) || - ((dir == QDF_RX) && (QDF_NBUF_CB_RX_DP_TRACE(nbuf) == 0))) + if ((nbuf) && ((QDF_NBUF_CB_TX_PACKET_TRACK(nbuf) != + QDF_NBUF_TX_PKT_DATA_TRACK) || + ((dir == QDF_TX) && (QDF_NBUF_CB_TX_DP_TRACE(nbuf) == 0)) || + ((dir == QDF_RX) && (QDF_NBUF_CB_RX_DP_TRACE(nbuf) == 0)))) return false; return true; @@ -2024,7 +2013,7 @@ void qdf_dp_trace(qdf_nbuf_t nbuf, enum QDF_DP_TRACE_ID code, if (qdf_dp_enable_check(nbuf, code, dir) == false) return; - qdf_dp_add_record(code, qdf_nbuf_data(nbuf), size, NULL, 0, + qdf_dp_add_record(code, data, size, NULL, 0, (nbuf != NULL) ? QDF_NBUF_CB_DP_TRACE_PRINT(nbuf) : false); } qdf_export_symbol(qdf_dp_trace); diff --git a/target_if/core/inc/target_if_def_config.h b/target_if/core/inc/target_if_def_config.h index 0d9f3f1e5e1f..a8795fb45f38 100644 --- a/target_if/core/inc/target_if_def_config.h +++ b/target_if/core/inc/target_if_def_config.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2011, 2013-2016, 2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef __TARGET_IF_DEF_CONFIG_H__ #define __TARGET_IF_DEF_CONFIG_H__ diff --git a/wmi/inc/wmi_unified_apf_tlv.h b/wmi/inc/wmi_unified_apf_tlv.h index 09eb1b1e2dd6..1727ee685846 100644 --- a/wmi/inc/wmi_unified_apf_tlv.h +++ b/wmi/inc/wmi_unified_apf_tlv.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #ifndef _WMI_UNIFIED_APF_TLV_H_ #define _WMI_UNIFIED_APF_TLV_H_ diff --git a/wmi/inc/wmi_unified_api.h b/wmi/inc/wmi_unified_api.h index 99ab19d82446..8c98fe836152 100644 --- a/wmi/inc/wmi_unified_api.h +++ b/wmi/inc/wmi_unified_api.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -20,12 +17,6 @@ */ /* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/* * This file contains the API definitions for the Unified Wireless Module * Interface (WMI). */ @@ -1475,6 +1466,18 @@ QDF_STATUS wmi_unified_extract_sar_limit_event(void *wmi_hdl, uint8_t *evt_buf, struct sar_limit_event *event); +/** + * wmi_unified_extract_sar2_result_event() - extract SAR limits from FW event + * @handle: wmi handle + * @event: event buffer received from firmware + * @len: length of the event buffer + * + * Return: QDF_STATUS_SUCCESS for success or error code + */ +QDF_STATUS wmi_unified_extract_sar2_result_event(void *handle, + uint8_t *event, uint32_t len); + + QDF_STATUS wmi_unified_send_adapt_dwelltime_params_cmd(void *wmi_hdl, struct wmi_adaptive_dwelltime_params * wmi_param); diff --git a/wmi/inc/wmi_unified_non_tlv.h b/wmi/inc/wmi_unified_non_tlv.h index 3e50b8f207b5..6aff17884907 100644 --- a/wmi/inc/wmi_unified_non_tlv.h +++ b/wmi/inc/wmi_unified_non_tlv.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #include <osdep.h> #include "wmi_unified_param.h" #include "legacy/wmi.h" diff --git a/wmi/inc/wmi_unified_param.h b/wmi/inc/wmi_unified_param.h index 9ead04fe1023..eba5979d6980 100644 --- a/wmi/inc/wmi_unified_param.h +++ b/wmi/inc/wmi_unified_param.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -20,12 +17,6 @@ */ /* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/* * This file contains the API definitions for the Unified Wireless Module * Interface (WMI). */ @@ -1825,6 +1816,7 @@ typedef struct { uint32_t wmm_caps; /* since this is 4 byte aligned, we don't declare it as tlv array */ uint32_t mcsset[WMI_HOST_ROAM_OFFLOAD_NUM_MCS_SET >> 2]; + uint32_t ho_delay_for_rx; } roam_offload_param; #define WMI_FILS_MAX_RRK_LENGTH 64 @@ -1868,6 +1860,8 @@ struct roam_fils_params { * @prefer_5ghz: prefer select 5G candidate * @roam_rssi_cat_gap: gap for every category bucket * @select_5ghz_margin: select 5 Ghz margin + * @min_delay_btw_roam_scans: Delay btw two roam scans + * @roam_trigger_reason_bitmask: Roam reason bitmark * @krk: KRK * @btk: BTK * @reassoc_failure_timeout: reassoc failure timeout @@ -1906,6 +1900,8 @@ struct roam_offload_scan_params { bool fw_okc; bool fw_pmksa_cache; #endif + uint32_t min_delay_btw_roam_scans; + uint32_t roam_trigger_reason_bitmask; bool is_ese_assoc; bool is_11r_assoc; struct mobility_domain_info mdid; @@ -3231,6 +3227,7 @@ struct wmi_tdls_params { uint32_t puapsd_rx_frame_threshold; uint32_t teardown_notification_ms; uint32_t tdls_peer_kickout_threshold; + uint32_t tdls_discovery_wake_timeout; }; /** @@ -5301,7 +5298,7 @@ typedef enum { wmi_get_arp_stats_req_id, wmi_sar_get_limits_event_id, wmi_roam_scan_stats_event_id, - + wmi_wlan_sar2_result_event_id, wmi_events_max, } wmi_conv_event_id; @@ -7384,7 +7381,9 @@ enum wmi_action_oui_id { WMI_ACTION_OUI_CONNECT_1X1 = 0, WMI_ACTION_OUI_ITO_EXTENSION = 1, WMI_ACTION_OUI_CCKM_1X1 = 2, - WMI_ACTION_OUI_MAXIMUM_ID = 3, + WMI_ACTION_OUI_ITO_ALTERNATE = 3, + WMI_ACTION_OUI_SWITCH_TO_11N_MODE = 4, + WMI_ACTION_OUI_MAXIMUM_ID = 5, }; /** diff --git a/wmi/inc/wmi_unified_priv.h b/wmi/inc/wmi_unified_priv.h index e3f80cbd1652..5394bbdfb8ba 100644 --- a/wmi/inc/wmi_unified_priv.h +++ b/wmi/inc/wmi_unified_priv.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -20,12 +17,6 @@ */ /* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/* * This file contains the API definitions for the Unified Wireless * Module Interface (WMI). */ @@ -1221,6 +1212,10 @@ QDF_STATUS (*extract_sar_limit_event)(wmi_unified_t wmi_handle, uint8_t *evt_buf, struct sar_limit_event *event); +QDF_STATUS (*extract_sar2_result_event)(void *handle, + uint8_t *event, + uint32_t len); + uint16_t (*wmi_set_htc_tx_tag)(wmi_unified_t wmi_handle, wmi_buf_t buf, uint32_t cmd_id); diff --git a/wmi/inc/wmi_unified_tlv.h b/wmi/inc/wmi_unified_tlv.h index 4292d90924d2..7af72303a072 100644 --- a/wmi/inc/wmi_unified_tlv.h +++ b/wmi/inc/wmi_unified_tlv.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ #ifndef _WMI_UNIFIED_TLV_H_ #define _WMI_UNIFIED_TLV_H_ #include <osdep.h> diff --git a/wmi/inc/wmi_version_whitelist.h b/wmi/inc/wmi_version_whitelist.h index 74605952f8fd..a114cf40ebb0 100644 --- a/wmi/inc/wmi_version_whitelist.h +++ b/wmi/inc/wmi_version_whitelist.h @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2014, 2016 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -20,12 +17,6 @@ */ /* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/* * Every Product Line or chipset or team can have its own Whitelist table. * The following is a list of versions that the present software can support * even though its versions are incompatible. Any entry here means that the diff --git a/wmi/src/wmi_tlv_helper.c b/wmi/src/wmi_tlv_helper.c index 451a4b3d8ae8..2d948e7a03f9 100644 --- a/wmi/src/wmi_tlv_helper.c +++ b/wmi/src/wmi_tlv_helper.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #include "wmi_tlv_platform.c" #include "wmi_tlv_defs.h" #include "wmi_version.h" diff --git a/wmi/src/wmi_tlv_platform.c b/wmi/src/wmi_tlv_platform.c index 7e0add1ad798..8afe92ef916c 100644 --- a/wmi/src/wmi_tlv_platform.c +++ b/wmi/src/wmi_tlv_platform.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2013-2014, 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -20,12 +17,6 @@ */ /* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/* * LMAC offload interface functions for WMI TLV Interface */ diff --git a/wmi/src/wmi_unified.c b/wmi/src/wmi_unified.c index 689edbf8a8a6..b774a782f577 100644 --- a/wmi/src/wmi_unified.c +++ b/wmi/src/wmi_unified.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2015-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -20,12 +17,6 @@ */ /* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/* * Host WMI unified implementation */ #include "htc_api.h" @@ -1720,9 +1711,9 @@ static inline void wmi_workqueue_watchdog_warn(uint32_t msg_type_id) } #ifdef CONFIG_SLUB_DEBUG_ON -static void wmi_workqueue_watchdog_bite(void *arg) +static void wmi_workqueue_watchdog_bite(unsigned long arg) { - struct wmi_wq_dbg_info *info = arg; + struct wmi_wq_dbg_info *info = (struct wmi_wq_dbg_info *)arg; wmi_workqueue_watchdog_warn(info->wd_msg_type_id); qdf_print_thread_trace(info->task); @@ -1732,9 +1723,9 @@ static void wmi_workqueue_watchdog_bite(void *arg) QDF_BUG(0); } #else -static inline void wmi_workqueue_watchdog_bite(void *arg) +static inline void wmi_workqueue_watchdog_bite(unsigned long arg) { - struct wmi_wq_dbg_info *info = arg; + struct wmi_wq_dbg_info *info = (struct wmi_wq_dbg_info *)arg; wmi_workqueue_watchdog_warn(info->wd_msg_type_id); } diff --git a/wmi/src/wmi_unified_apf_tlv.c b/wmi/src/wmi_unified_apf_tlv.c index 8cb3aba07dc9..91ddd7022402 100644 --- a/wmi/src/wmi_unified_apf_tlv.c +++ b/wmi/src/wmi_unified_apf_tlv.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #include "wmi_unified_apf_tlv.h" QDF_STATUS send_set_active_apf_mode_cmd_tlv(wmi_unified_t wmi_handle, diff --git a/wmi/src/wmi_unified_api.c b/wmi/src/wmi_unified_api.c index c29f11e23543..77b2cd165645 100644 --- a/wmi/src/wmi_unified_api.c +++ b/wmi/src/wmi_unified_api.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,11 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ #include "wmi_unified_priv.h" #include "wmi_unified_param.h" @@ -6428,6 +6420,19 @@ QDF_STATUS wmi_unified_extract_sar_limit_event(void *wmi_hdl, return QDF_STATUS_E_FAILURE; } +QDF_STATUS wmi_unified_extract_sar2_result_event(void *handle, + uint8_t *event, uint32_t len) +{ + wmi_unified_t wmi_handle = handle; + + if (wmi_handle->ops->extract_sar2_result_event) + return wmi_handle->ops->extract_sar2_result_event(wmi_handle, + event, + len); + + return QDF_STATUS_E_FAILURE; +} + /** * wmi_unified_encrypt_decrypt_send_cmd() - send encryptdecrypt cmd to fw * @wmi_hdl: wmi handle diff --git a/wmi/src/wmi_unified_non_tlv.c b/wmi/src/wmi_unified_non_tlv.c index b44b3c4a51f7..3db7653c231f 100644 --- a/wmi/src/wmi_unified_non_tlv.c +++ b/wmi/src/wmi_unified_non_tlv.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #include "wmi_unified_api.h" #include "wmi_unified_priv.h" diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c index 2f5fb84536ac..37e452ddd87a 100644 --- a/wmi/src/wmi_unified_tlv.c +++ b/wmi/src/wmi_unified_tlv.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved. * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * * 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 @@ -19,12 +16,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - #include "wmi_unified_tlv.h" #include "wmi_unified_apf_tlv.h" #include "wmi_unified_api.h" @@ -4057,6 +4048,63 @@ static QDF_STATUS get_sar_limit_cmd_tlv(wmi_unified_t wmi_handle) return status; } + +/** + * wmi_sar2_result_string() - return string conversion of sar2 result + * @result: sar2 result value + * + * This utility function helps log string conversion of sar2 result. + * + * Return: string conversion of sar 2 result, if match found; + * "Unknown response" otherwise. + */ +static const char *wmi_sar2_result_string(uint32_t result) +{ + switch (result) { + CASE_RETURN_STRING(WMI_SAR2_SUCCESS); + CASE_RETURN_STRING(WMI_SAR2_INVALID_ANTENNA_INDEX); + CASE_RETURN_STRING(WMI_SAR2_INVALID_TABLE_INDEX); + CASE_RETURN_STRING(WMI_SAR2_STATE_ERROR); + CASE_RETURN_STRING(WMI_SAR2_BDF_NO_TABLE); + default: + return "Unknown response"; + } +} + +/** + * extract_sar2_result_event_tlv() - process sar response event from FW. + * @handle: wma handle + * @event: event buffer + * @len: buffer length + * + * Return: 0 for success or error code + */ +static QDF_STATUS extract_sar2_result_event_tlv(void *handle, + uint8_t *event, + uint32_t len) +{ + wmi_sar2_result_event_fixed_param *sar2_fixed_param; + + WMI_SAR2_RESULT_EVENTID_param_tlvs *param_buf = + (WMI_SAR2_RESULT_EVENTID_param_tlvs *) event; + + if (!param_buf) { + WMI_LOGI("Invalid sar2 result event buffer"); + return QDF_STATUS_E_INVAL;; + } + + sar2_fixed_param = param_buf->fixed_param; + if (!sar2_fixed_param) { + WMI_LOGI("Invalid sar2 result event fixed param buffer"); + return QDF_STATUS_E_INVAL;; + } + + WMI_LOGI("SAR2 result: %s", + wmi_sar2_result_string(sar2_fixed_param->result)); + + return QDF_STATUS_SUCCESS; +} + static QDF_STATUS extract_sar_limit_event_tlv(wmi_unified_t wmi_handle, uint8_t *evt_buf, struct sar_limit_event *event) @@ -4743,6 +4791,10 @@ QDF_STATUS send_roam_scan_offload_mode_cmd_tlv(wmi_unified_t wmi_handle, WMITLV_GET_STRUCT_TLVLEN (wmi_roam_scan_mode_fixed_param)); + roam_scan_mode_fp->min_delay_roam_trigger_reason_bitmask = + roam_req->roam_trigger_reason_bitmask; + roam_scan_mode_fp->min_delay_btw_scans = + WMI_SEC_TO_MSEC(roam_req->min_delay_btw_roam_scans); roam_scan_mode_fp->roam_scan_mode = roam_req->mode; roam_scan_mode_fp->vdev_id = roam_req->vdev_id; if (roam_req->mode == (WMI_ROAM_SCAN_MODE_NONE | @@ -4778,6 +4830,8 @@ QDF_STATUS send_roam_scan_offload_mode_cmd_tlv(wmi_unified_t wmi_handle, roam_offload_params->rssi_cat_gap = roam_req->roam_rssi_cat_gap; roam_offload_params->select_5g_margin = roam_req->select_5ghz_margin; + roam_offload_params->handoff_delay_for_rx = + roam_req->roam_offload_params.ho_delay_for_rx; roam_offload_params->reassoc_failure_timeout = roam_req->reassoc_failure_timeout; @@ -10048,6 +10102,8 @@ QDF_STATUS send_update_fw_tdls_state_cmd_tlv(wmi_unified_t wmi_handle, wmi_tdls->teardown_notification_ms; cmd->tdls_peer_kickout_threshold = wmi_tdls->tdls_peer_kickout_threshold; + cmd->tdls_discovery_wake_timeout = + wmi_tdls->tdls_discovery_wake_timeout; WMI_LOGD("%s: tdls_state: %d, state: %d, " "notification_interval_ms: %d, " @@ -10062,7 +10118,8 @@ QDF_STATUS send_update_fw_tdls_state_cmd_tlv(wmi_unified_t wmi_handle, "tdls_puapsd_inactivity_time: %d, " "tdls_puapsd_rx_frame_threshold: %d, " "teardown_notification_ms: %d, " - "tdls_peer_kickout_threshold: %d", + "tdls_peer_kickout_threshold: %d, " + "tdls_discovery_wake_timeout: %d", __func__, tdls_state, cmd->state, cmd->notification_interval_ms, cmd->tx_discovery_threshold, @@ -10076,7 +10133,8 @@ QDF_STATUS send_update_fw_tdls_state_cmd_tlv(wmi_unified_t wmi_handle, cmd->tdls_puapsd_inactivity_time_ms, cmd->tdls_puapsd_rx_frame_threshold, cmd->teardown_notification_ms, - cmd->tdls_peer_kickout_threshold); + cmd->tdls_peer_kickout_threshold, + cmd->tdls_discovery_wake_timeout); if (wmi_unified_cmd_send(wmi_handle, wmi_buf, len, WMI_TDLS_SET_STATE_CMDID)) { @@ -14075,6 +14133,13 @@ wmi_get_action_oui_id(enum wmi_action_oui_id action_id, *id = WMI_VENDOR_OUI_ACTION_CCKM_1X1; return true; + case WMI_ACTION_OUI_ITO_ALTERNATE: + *id = WMI_VENDOR_OUI_ACTION_ALT_ITO; + + case WMI_ACTION_OUI_SWITCH_TO_11N_MODE: + *id = WMI_VENDOR_OUI_ACTION_SWITCH_TO_11N_MODE; + return true; + default: return false; } @@ -15076,6 +15141,7 @@ struct wmi_ops tlv_ops = { .send_sar_limit_cmd = send_sar_limit_cmd_tlv, .get_sar_limit_cmd = get_sar_limit_cmd_tlv, .extract_sar_limit_event = extract_sar_limit_event_tlv, + .extract_sar2_result_event = extract_sar2_result_event_tlv, .send_per_roam_config_cmd = send_per_roam_config_cmd_tlv, .send_action_oui_cmd = send_action_oui_cmd_tlv, .wmi_set_htc_tx_tag = wmi_set_htc_tx_tag_tlv, @@ -15448,7 +15514,7 @@ static void populate_tlv_events_id(uint32_t *event_ids) event_ids[wmi_get_arp_stats_req_id] = WMI_VDEV_GET_ARP_STATS_EVENTID; event_ids[wmi_sar_get_limits_event_id] = WMI_SAR_GET_LIMITS_EVENTID; event_ids[wmi_roam_scan_stats_event_id] = WMI_ROAM_SCAN_STATS_EVENTID; -} + event_ids[wmi_wlan_sar2_result_event_id] = WMI_SAR2_RESULT_EVENTID; } /** |