qcacld-3.0: hdd: Remove legacy markings

Per current guidance remove legacy markings. Change-Id: I616925db8255eb2f1e327cd2ddb3da70d47ca943 CRs-Fixed: 2229655
2018-04-23 14:07:08 -07:00
commit f367ac732a
--- a/core/hdd/inc/qc_sap_ioctl.h
+++ b/core/hdd/inc/qc_sap_ioctl.h
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 2012-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 _QC_SAP_IOCTL_H_
 #define _QC_SAP_IOCTL_H_

--- a/core/hdd/inc/wlan_hdd_assoc.h
+++ b/core/hdd/inc/wlan_hdd_assoc.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.
- */
-
 #if !defined(WLAN_HDD_ASSOC_H__)
 #define WLAN_HDD_ASSOC_H__

--- a/core/hdd/inc/wlan_hdd_cfg.h
+++ b/core/hdd/inc/wlan_hdd_cfg.h
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 2012-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(HDD_CONFIG_H__)
 #define HDD_CONFIG_H__

--- a/core/hdd/inc/wlan_hdd_conc_ut.h
+++ b/core/hdd/inc/wlan_hdd_conc_ut.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 __WLAN_HDD_CONC_UT_H
 #define __WLAN_HDD_CONC_UT_H

--- a/core/hdd/inc/wlan_hdd_debugfs.h
+++ b/core/hdd/inc/wlan_hdd_debugfs.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 _WLAN_HDD_DEBUGFS_H
 #define _WLAN_HDD_DEBUGFS_H

--- a/core/hdd/inc/wlan_hdd_debugfs_llstat.h
+++ b/core/hdd/inc/wlan_hdd_debugfs_llstat.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: wlan_hdd_debugfs_llstat.h
 *
--- a/core/hdd/inc/wlan_hdd_driver_ops.h
+++ b/core/hdd/inc/wlan_hdd_driver_ops.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 __WLAN_HDD_DRIVER_OPS_H__
 #define __WLAN_HDD_DRIVER_OPS_H__

--- a/core/hdd/inc/wlan_hdd_ether.h
+++ b/core/hdd/inc/wlan_hdd_ether.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.
- */
-
 #ifndef _WLAN_HDD_ETHER_H
 #define _WLAN_HDD_ETHER_H
 /**
--- a/core/hdd/inc/wlan_hdd_ftm.h
+++ b/core/hdd/inc/wlan_hdd_ftm.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 WLAN_HDD_FTM_H
 #define WLAN_HDD_FTM_H

--- a/core/hdd/inc/wlan_hdd_host_offload.h
+++ b/core/hdd/inc/wlan_hdd_host_offload.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.
- */
-
 #ifndef __WLAN_HDD_HOST_OFFLOAD_H__
 #define __WLAN_HDD_HOST_OFFLOAD_H__

--- a/core/hdd/inc/wlan_hdd_includes.h
+++ b/core/hdd/inc/wlan_hdd_includes.h
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 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(HDD_INCLUDES_H__)
 #define HDD_INCLUDES_H__

--- a/core/hdd/inc/wlan_hdd_ipa.h
+++ b/core/hdd/inc/wlan_hdd_ipa.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 HDD_IPA_H__
 #define HDD_IPA_H__

@@ -32,7 +23,6 @@
 * DOC: wlan_hdd_ipa.h
 *
 * WLAN IPA interface module headers
- * Originally written by Qualcomm Atheros, Inc
 */

 #include <qdf_nbuf.h>
--- a/core/hdd/inc/wlan_hdd_lro.h
+++ b/core/hdd/inc/wlan_hdd_lro.h
@@ -1,8 +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
@@ -18,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 __WLAN_HDD_LRO_H__
 #define __WLAN_HDD_LRO_H__
 /**
--- a/core/hdd/inc/wlan_hdd_main.h
+++ b/core/hdd/inc/wlan_hdd_main.h
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 2012-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(WLAN_HDD_MAIN_H)
 #define WLAN_HDD_MAIN_H
 /**
--- a/core/hdd/inc/wlan_hdd_misc.h
+++ b/core/hdd/inc/wlan_hdd_misc.h
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 2012-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 WLAN_HDD_MISC_H
 #define WLAN_HDD_MISC_H
 /*
--- a/core/hdd/inc/wlan_hdd_nan.h
+++ b/core/hdd/inc/wlan_hdd_nan.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.
- */
-
 #ifndef __WLAN_HDD_NAN_H
 #define __WLAN_HDD_NAN_H

--- a/core/hdd/inc/wlan_hdd_napi.h
+++ b/core/hdd/inc/wlan_hdd_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 __HDD_NAPI_H__
 #define __HDD_NAPI_H__

--- a/core/hdd/inc/wlan_hdd_oemdata.h
+++ b/core/hdd/inc/wlan_hdd_oemdata.h
@@ -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: wlan_hdd_oemdata.h
 *
--- a/core/hdd/inc/wlan_hdd_p2p.h
+++ b/core/hdd/inc/wlan_hdd_p2p.h
@@ -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.
- */
-
 #ifndef __P2P_H
 #define __P2P_H

--- a/core/hdd/inc/wlan_hdd_power.h
+++ b/core/hdd/inc/wlan_hdd_power.h
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 2012, 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.
- */
-
 #ifndef __WLAN_HDD_POWER_H
 #define __WLAN_HDD_POWER_H

--- a/core/hdd/inc/wlan_hdd_regulatory.h
+++ b/core/hdd/inc/wlan_hdd_regulatory.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.
- */
-
 #if !defined __HDD_REGULATORY_H
 #define __HDD_REGULATORY_H

--- a/core/hdd/inc/wlan_hdd_softap_tx_rx.h
+++ b/core/hdd/inc/wlan_hdd_softap_tx_rx.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(WLAN_HDD_SOFTAP_TX_RX_H)
 #define WLAN_HDD_SOFTAP_TX_RX_H

--- a/core/hdd/inc/wlan_hdd_sysfs.h
+++ b/core/hdd/inc/wlan_hdd_sysfs.h
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 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
--- a/core/hdd/inc/wlan_hdd_tdls.h
+++ b/core/hdd/inc/wlan_hdd_tdls.h
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 2012-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 __HDD_TDLS_H
 #define __HDD_TDLS_H
 /**
--- a/core/hdd/inc/wlan_hdd_trace.h
+++ b/core/hdd/inc/wlan_hdd_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.
- */
-
 #ifndef __WLAN_HDD_TRACE_H__
 #define __WLAN_HDD_TRACE_H__

--- a/core/hdd/inc/wlan_hdd_tsf.h
+++ b/core/hdd/inc/wlan_hdd_tsf.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.
- */
-
 #if !defined WLAN_HDD_TSF_H
 #define WLAN_HDD_TSF_H
 #include "wlan_hdd_cfg.h"
--- a/core/hdd/inc/wlan_hdd_tx_rx.h
+++ b/core/hdd/inc/wlan_hdd_tx_rx.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.
- */
-
 #if !defined(WLAN_HDD_TX_RX_H)
 #define WLAN_HDD_TX_RX_H

--- a/core/hdd/inc/wlan_hdd_wext.h
+++ b/core/hdd/inc/wlan_hdd_wext.h
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 2012-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 __WEXT_IW_H__
 #define __WEXT_IW_H__

--- a/core/hdd/inc/wlan_hdd_wmm.h
+++ b/core/hdd/inc/wlan_hdd_wmm.h
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 2011-2012,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 _WLAN_HDD_WMM_H
 #define _WLAN_HDD_WMM_H

--- a/core/hdd/inc/wlan_hdd_wowl.h
+++ b/core/hdd/inc/wlan_hdd_wowl.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 _WLAN_HDD_WOWL_H
 #define _WLAN_HDD_WOWL_H

--- a/core/hdd/src/wlan_hdd_assoc.c
+++ b/core/hdd/src/wlan_hdd_assoc.c
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 2012-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: wlan_hdd_assoc.c
 *
--- a/core/hdd/src/wlan_hdd_cfg.c
+++ b/core/hdd/src/wlan_hdd_cfg.c
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 2012-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:  wlan_hdd_cfg.c
 *
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 2012-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: wlan_hdd_cfg80211.c
 *
--- a/core/hdd/src/wlan_hdd_cfg80211.h
+++ b/core/hdd/src/wlan_hdd_cfg80211.h
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 2012-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: wlan_hdd_cfg80211.h
 *
--- a/core/hdd/src/wlan_hdd_conc_ut.c
+++ b/core/hdd/src/wlan_hdd_conc_ut.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 files */

 #include <wlan_hdd_includes.h>
--- a/core/hdd/src/wlan_hdd_debugfs.c
+++ b/core/hdd/src/wlan_hdd_debugfs.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.
- */
-
 /**
 * DOC: wlan_hdd_debugfs.c
 *
--- a/core/hdd/src/wlan_hdd_debugfs_llstat.c
+++ b/core/hdd/src/wlan_hdd_debugfs_llstat.c
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 2012-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
--- a/core/hdd/src/wlan_hdd_driver_ops.c
+++ b/core/hdd/src/wlan_hdd_driver_ops.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 <linux/platform_device.h>
 #include <linux/pci.h>
 #include "cds_api.h"
--- a/core/hdd/src/wlan_hdd_ext_scan.c
+++ b/core/hdd/src/wlan_hdd_ext_scan.c
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 2012-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
--- a/core/hdd/src/wlan_hdd_ext_scan.h
+++ b/core/hdd/src/wlan_hdd_ext_scan.h
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 2012-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
--- a/core/hdd/src/wlan_hdd_ftm.c
+++ b/core/hdd/src/wlan_hdd_ftm.c
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 2012-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: wlan_hdd_ftm.c
 *
--- a/core/hdd/src/wlan_hdd_hostapd.c
+++ b/core/hdd/src/wlan_hdd_hostapd.c
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 2012-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:  wlan_hdd_hostapd.c
 *
--- a/core/hdd/src/wlan_hdd_hostapd.h
+++ b/core/hdd/src/wlan_hdd_hostapd.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.
- */
-
 #if !defined(WLAN_HDD_HOSTAPD_H)
 #define WLAN_HDD_HOSTAPD_H

--- a/core/hdd/src/wlan_hdd_ioctl.c
+++ b/core/hdd/src/wlan_hdd_ioctl.c
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 2012-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 Files */

 #include <wlan_hdd_includes.h>
--- a/core/hdd/src/wlan_hdd_ioctl.h
+++ b/core/hdd/src/wlan_hdd_ioctl.h
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 2012-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.
- */
-
 #if !defined(WLAN_HDD_IOCTL_H)
 #define WLAN_HDD_IOCTL_H

--- a/core/hdd/src/wlan_hdd_ipa.c
+++ b/core/hdd/src/wlan_hdd_ipa.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,17 +16,10 @@
 * 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: wlan_hdd_ipa.c
 *
 * WLAN HDD and ipa interface implementation
- * Originally written by Qualcomm Atheros, Inc
 */

 /* Include Files */
--- a/core/hdd/src/wlan_hdd_lpass.c
+++ b/core/hdd/src/wlan_hdd_lpass.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: wlan_hdd_lpass.c
 *
--- a/core/hdd/src/wlan_hdd_lpass.h
+++ b/core/hdd/src/wlan_hdd_lpass.h
@@ -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.
- */
-
 #if !defined(WLAN_HDD_LPASS_H)
 #define WLAN_HDD_LPASS_H

--- a/core/hdd/src/wlan_hdd_lro.c
+++ b/core/hdd/src/wlan_hdd_lro.c
@@ -1,8 +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
@@ -18,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: wlan_hdd_lro.c
 *
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 2012-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: wlan_hdd_main.c
 *
--- a/core/hdd/src/wlan_hdd_memdump.c
+++ b/core/hdd/src/wlan_hdd_memdump.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.
- */
-
 /**
 * DOC : wlan_hdd_memdump.c
 *
--- a/core/hdd/src/wlan_hdd_nan.c
+++ b/core/hdd/src/wlan_hdd_nan.c
@@ -1,8 +1,6 @@
 /*
 * Copyright (c) 2012-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
--- a/core/hdd/src/wlan_hdd_nan_datapath.c
+++ b/core/hdd/src/wlan_hdd_nan_datapath.c
@@ -1,8 +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
--- a/core/hdd/src/wlan_hdd_nan_datapath.h
+++ b/core/hdd/src/wlan_hdd_nan_datapath.h
@@ -1,8 +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
--- a/core/hdd/src/wlan_hdd_napi.c
+++ b/core/hdd/src/wlan_hdd_napi.c
@@ -1,8 +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
@@ -18,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: wlan_hdd_napi.c
 *
--- a/core/hdd/src/wlan_hdd_object_manager.c
+++ b/core/hdd/src/wlan_hdd_object_manager.c
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 2017-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: HDD object manager API source file to create/destroy PSOC,
 *  PDEV, VDEV and PEER objects.
--- a/core/hdd/src/wlan_hdd_object_manager.h
+++ b/core/hdd/src/wlan_hdd_object_manager.h
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 2017-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.
- */
 #if !defined(WLAN_HDD_OBJECT_MANAGER_H)
 #define WLAN_HDD_OBJECT_MANAGER_H
 /**
--- a/core/hdd/src/wlan_hdd_ocb.c
+++ b/core/hdd/src/wlan_hdd_ocb.c
@@ -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,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: wlan_hdd_ocb.c
 *
--- a/core/hdd/src/wlan_hdd_ocb.h
+++ b/core/hdd/src/wlan_hdd_ocb.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 __WLAN_HDD_OCB_H
 #define __WLAN_HDD_OCB_H

--- a/core/hdd/src/wlan_hdd_oemdata.c
+++ b/core/hdd/src/wlan_hdd_oemdata.c
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 2012-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.
- */
-
 #ifdef FEATURE_OEM_DATA_SUPPORT

 /**
--- a/core/hdd/src/wlan_hdd_p2p.c
+++ b/core/hdd/src/wlan_hdd_p2p.c
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 2012-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.
- */
-
 /**
 *
 * @file  wlan_hdd_p2p.c
--- a/core/hdd/src/wlan_hdd_power.c
+++ b/core/hdd/src/wlan_hdd_power.c
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 2012-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: wlan_hdd_power.c
 *
--- a/core/hdd/src/wlan_hdd_regulatory.c
+++ b/core/hdd/src/wlan_hdd_regulatory.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: wlan_hdd_regulatory.c
 *
--- a/core/hdd/src/wlan_hdd_request_manager.c
+++ b/core/hdd/src/wlan_hdd_request_manager.c
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 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/kernel.h>
 #include "wlan_hdd_request_manager.h"
 #include "wlan_hdd_main.h"
--- a/core/hdd/src/wlan_hdd_request_manager.h
+++ b/core/hdd/src/wlan_hdd_request_manager.h
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 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 __WLAN_HDD_REQUEST_MANAGER_H__
 #define __WLAN_HDD_REQUEST_MANAGER_H__

--- a/core/hdd/src/wlan_hdd_rx_monitor.c
+++ b/core/hdd/src/wlan_hdd_rx_monitor.c
@@ -1,8 +1,6 @@
 /*
 * Copyright (c) 2017-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
@@ -18,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 "wlan_hdd_includes.h"
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
--- a/core/hdd/src/wlan_hdd_rx_monitor.h
+++ b/core/hdd/src/wlan_hdd_rx_monitor.h
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 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 __WLAN_HDD_RX_MONITOR_H
 #define __WLAN_HDD_RX_MONITOR_H

--- a/core/hdd/src/wlan_hdd_scan.c
+++ b/core/hdd/src/wlan_hdd_scan.c
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 2012-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: wlan_hdd_scan.c
 *
--- a/core/hdd/src/wlan_hdd_scan.h
+++ b/core/hdd/src/wlan_hdd_scan.h
@@ -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
--- a/core/hdd/src/wlan_hdd_softap_tx_rx.c
+++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 2012-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.
- */
-
 /* denote that this file does not allow legacy hddLog */
 #define HDD_DISALLOW_LEGACY_HDDLOG 1

--- a/core/hdd/src/wlan_hdd_stats.c
+++ b/core/hdd/src/wlan_hdd_stats.c
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 2012-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
--- a/core/hdd/src/wlan_hdd_stats.h
+++ b/core/hdd/src/wlan_hdd_stats.h
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 2012-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
--- a/core/hdd/src/wlan_hdd_subnet_detect.c
+++ b/core/hdd/src/wlan_hdd_subnet_detect.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
--- a/core/hdd/src/wlan_hdd_subnet_detect.h
+++ b/core/hdd/src/wlan_hdd_subnet_detect.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 __WLAN_HDD_SUBNET_DETECT_H
 #define __WLAN_HDD_SUBNET_DETECT_H

--- a/core/hdd/src/wlan_hdd_sysfs.c
+++ b/core/hdd/src/wlan_hdd_sysfs.c
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 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
--- a/core/hdd/src/wlan_hdd_tdls.c
+++ b/core/hdd/src/wlan_hdd_tdls.c
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 2012-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: wlan_hdd_tdls.c
 *
--- a/core/hdd/src/wlan_hdd_trace.c
+++ b/core/hdd/src/wlan_hdd_trace.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.
- */
-
 #ifdef HDD_TRACE_RECORD

 /**
--- a/core/hdd/src/wlan_hdd_tsf.c
+++ b/core/hdd/src/wlan_hdd_tsf.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.
- */
-
 /**
 * wlan_hdd_tsf.c - WLAN Host Device Driver tsf related implementation
 */
--- a/core/hdd/src/wlan_hdd_tx_rx.c
+++ b/core/hdd/src/wlan_hdd_tx_rx.c
@@ -1,9 +1,6 @@
 /*
 * Copyright (c) 2012-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: wlan_hdd_tx_rx.c
 *
--- a/core/hdd/src/wlan_hdd_wext.c
+++ b/core/hdd/src/wlan_hdd_wext.c
@@ -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,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: wlan_hdd_wext.c
 *
--- a/core/hdd/src/wlan_hdd_wmm.c
+++ b/core/hdd/src/wlan_hdd_wmm.c
@@ -1,8 +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
@@ -18,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: HDD WMM
 *
--- a/core/hdd/src/wlan_hdd_wowl.c
+++ b/core/hdd/src/wlan_hdd_wowl.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.
- */
-
 /**
 * @file wlan_hdd_wowl.c
 *