| Message ID | 20181024070436.4466-1-johannes@sipsolutions.net (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Luca Coelho |
| Headers | show |
| Series | iwlwifi: pcie: align licensing to dual GPL/BSD | expand |
On Wed, Oct 24, 2018 at 9:05 AM Johannes Berg <johannes@sipsolutions.net> wrote: > > From: Johannes Berg <johannes.berg@intel.com> > > These files have a long history of code changes, but analysing > the remaining code leads to having only a few changes that are > not already owned by Intel, notably from > - Andy Lutomirski <luto@amacapital.net> > - Joonwoo Park <joonwpark81@gmail.com> > - Kirtika Ruchandani <kirtika@chromium.org> > - Rajat Jain <rajatja@google.com> > - Stanislaw Gruszka <sgruszka@redhat.com> > remaining in the code today. > > Note that > - I myself was working for Intel and for any possibly code > that might be before my employment there give permission > - Wizery employees were working for Intel > > More specifically, we identified the following commits that > (partially may) remain today: > > 25c03d8e8c13 Joonwoo Park <joonwpark81@gmail.com> ("iwlwifi: do not schedule tasklet when rcv unused irq") > f36d04abe684 Stanislaw Gruszka <sgruszka@redhat.com> ("iwlwifi: use dma_alloc_coherent") > 387f3381f732 Stanislaw Gruszka <sgruszka@redhat.com> ("iwlwifi: fix dma mappings and skbs leak") > 2624e96ce16b Stanislaw Gruszka <sgruszka@redhat.com> ("iwlwifi: fix possible data overwrite in hcmd callback") > bfe4b80e9f73 Stanislaw Gruszka <sgruszka@redhat.com> ("iwlwifi: always check if got h/w access before write") > d536c32b45d2 Andy Lutomirski <luto@amacapital.net> ("iwlwifi: pcie: log when waking the NIC for hcmd submission fails") > a6d24fad00d9 Rajat Jain <rajatja@google.com> ("iwlwifi: pcie: dump registers when HW becomes inaccessible") > fb12777ab59b Kirtika Ruchandani <kirtika@chromium.org> ("iwlwifi: Add more call-sites for pcie reg dumper") > 3a73a30049f2 Stanislaw Gruszka <sgruszka@redhat.com> ("iwlwifi: cleanup/fix memory barriers") > aa5affbacb24 Stanislaw Gruszka <sgruszka@redhat.com> ("iwlwifi: dump stack when fail to gain access to the device") > > Align the licenses with their permission to clean up and to > make it all identical. > Does it make sense to put the BSD license (text) in a separate file (like GPL) and reference it? - Sedat - > CC: Joonwoo Park <joonwpark81@gmail.com> > CC: Stanislaw Gruszka <sgruszka@redhat.com> > CC: Andy Lutomirski <luto@amacapital.net> > CC: Rajat Jain <rajatja@google.com> > CC: Kirtika Ruchandani <kirtika@chromium.org> > Acked-by: Johannes Berg <johannes@sipsolutions.net> > Signed-off-by: Johannes Berg <johannes.berg@intel.com> > --- > I'd appreciate if you (in CC lines) could provide your acked-by here. > --- > drivers/net/wireless/intel/iwlwifi/iwl-io.c | 41 +++++++++++++++-- > drivers/net/wireless/intel/iwlwifi/iwl-io.h | 38 ++++++++++++++-- > .../wireless/intel/iwlwifi/pcie/internal.h | 44 +++++++++++++++++-- > drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 44 +++++++++++++++++-- > drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 44 +++++++++++++++++-- > 5 files changed, 192 insertions(+), 19 deletions(-) > > diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-io.c b/drivers/net/wireless/intel/iwlwifi/iwl-io.c > index 4f10914f6048..ffd1e649bfa0 100644 > --- a/drivers/net/wireless/intel/iwlwifi/iwl-io.c > +++ b/drivers/net/wireless/intel/iwlwifi/iwl-io.c > @@ -1,10 +1,13 @@ > /****************************************************************************** > + * > + * This file is provided under a dual BSD/GPLv2 license. When using or > + * redistributing this file, you may do so under either license. > + * > + * GPL LICENSE SUMMARY > * > * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved. > * Copyright(c) 2015 - 2016 Intel Deutschland GmbH > * > - * Portions of this file are derived from the ipw3945 project. > - * > * This program is free software; you can redistribute it and/or modify it > * under the terms of version 2 of the GNU General Public License as > * published by the Free Software Foundation. > @@ -15,12 +18,44 @@ > * more details. > * > * The full GNU General Public License is included in this distribution in the > - * file called LICENSE. > + * file called COPYING. > * > * Contact Information: > * Intel Linux Wireless <linuxwifi@intel.com> > * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 > * > + * BSD LICENSE > + * > + * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved. > + * Copyright(c) 2015 - 2016 Intel Deutschland GmbH > + * All rights reserved. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * > + * * Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * * Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in > + * the documentation and/or other materials provided with the > + * distribution. > + * * Neither the name Intel Corporation nor the names of its > + * contributors may be used to endorse or promote products derived > + * from this software without specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT > + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, > + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT > + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, > + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY > + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + * > *****************************************************************************/ > #include <linux/delay.h> > #include <linux/device.h> > diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-io.h b/drivers/net/wireless/intel/iwlwifi/iwl-io.h > index 38085850a2d3..61477e58352d 100644 > --- a/drivers/net/wireless/intel/iwlwifi/iwl-io.h > +++ b/drivers/net/wireless/intel/iwlwifi/iwl-io.h > @@ -1,8 +1,9 @@ > /****************************************************************************** > * > - * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved. > + * This file is provided under a dual BSD/GPLv2 license. When using or > + * redistributing this file, you may do so under either license. > * > - * Portions of this file are derived from the ipw3945 project. > + * GPL LICENSE SUMMARY > * > * This program is free software; you can redistribute it and/or modify it > * under the terms of version 2 of the GNU General Public License as > @@ -14,14 +15,43 @@ > * more details. > * > * The full GNU General Public License is included in this distribution in the > - * file called LICENSE. > + * file called COPYING. > * > * Contact Information: > * Intel Linux Wireless <linuxwifi@intel.com> > * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 > * > + * BSD LICENSE > + * > + * All rights reserved. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * > + * * Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * * Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in > + * the documentation and/or other materials provided with the > + * distribution. > + * * Neither the name Intel Corporation nor the names of its > + * contributors may be used to endorse or promote products derived > + * from this software without specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT > + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, > + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT > + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, > + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY > + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + * > *****************************************************************************/ > - > #ifndef __iwl_io_h__ > #define __iwl_io_h__ > > diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h > index f9c4c64dee66..6821d09df8db 100644 > --- a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h > +++ b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h > @@ -1,13 +1,15 @@ > /****************************************************************************** > + * > + * This file is provided under a dual BSD/GPLv2 license. When using or > + * redistributing this file, you may do so under either license. > + * > + * GPL LICENSE SUMMARY > * > * Copyright(c) 2003 - 2015 Intel Corporation. All rights reserved. > * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH > * Copyright(c) 2016 - 2017 Intel Deutschland GmbH > * Copyright(c) 2018 Intel Corporation > * > - * Portions of this file are derived from the ipw3945 project, as well > - * as portions of the ieee80211 subsystem header files. > - * > * This program is free software; you can redistribute it and/or modify it > * under the terms of version 2 of the GNU General Public License as > * published by the Free Software Foundation. > @@ -18,12 +20,46 @@ > * more details. > * > * The full GNU General Public License is included in this distribution in the > - * file called LICENSE. > + * file called COPYING. > * > * Contact Information: > * Intel Linux Wireless <linuxwifi@intel.com> > * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 > * > + * BSD LICENSE > + * > + * Copyright(c) 2003 - 2015 Intel Corporation. All rights reserved. > + * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH > + * Copyright(c) 2016 - 2017 Intel Deutschland GmbH > + * Copyright(c) 2018 Intel Corporation > + * All rights reserved. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * > + * * Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * * Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in > + * the documentation and/or other materials provided with the > + * distribution. > + * * Neither the name Intel Corporation nor the names of its > + * contributors may be used to endorse or promote products derived > + * from this software without specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT > + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, > + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT > + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, > + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY > + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + * > *****************************************************************************/ > #ifndef __iwl_trans_int_pcie_h__ > #define __iwl_trans_int_pcie_h__ > diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c > index e965cc588850..f4ad89aeaa0a 100644 > --- a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c > +++ b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c > @@ -1,13 +1,15 @@ > /****************************************************************************** > + * > + * This file is provided under a dual BSD/GPLv2 license. When using or > + * redistributing this file, you may do so under either license. > + * > + * GPL LICENSE SUMMARY > * > * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved. > * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH > * Copyright(c) 2016 - 2017 Intel Deutschland GmbH > * Copyright(c) 2018 Intel Corporation > * > - * Portions of this file are derived from the ipw3945 project, as well > - * as portions of the ieee80211 subsystem header files. > - * > * This program is free software; you can redistribute it and/or modify it > * under the terms of version 2 of the GNU General Public License as > * published by the Free Software Foundation. > @@ -18,12 +20,46 @@ > * more details. > * > * The full GNU General Public License is included in this distribution in the > - * file called LICENSE. > + * file called COPYING. > * > * Contact Information: > * Intel Linux Wireless <linuxwifi@intel.com> > * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 > * > + * BSD LICENSE > + * > + * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved. > + * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH > + * Copyright(c) 2016 - 2017 Intel Deutschland GmbH > + * Copyright(c) 2018 Intel Corporation > + * All rights reserved. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * > + * * Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * * Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in > + * the documentation and/or other materials provided with the > + * distribution. > + * * Neither the name Intel Corporation nor the names of its > + * contributors may be used to endorse or promote products derived > + * from this software without specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT > + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, > + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT > + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, > + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY > + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + * > *****************************************************************************/ > #include <linux/sched.h> > #include <linux/wait.h> > diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c > index f227b91098c9..60487d11eaa8 100644 > --- a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c > +++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c > @@ -1,13 +1,15 @@ > /****************************************************************************** > + * > + * This file is provided under a dual BSD/GPLv2 license. When using or > + * redistributing this file, you may do so under either license. > + * > + * GPL LICENSE SUMMARY > * > * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved. > * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH > * Copyright(c) 2016 - 2017 Intel Deutschland GmbH > * Copyright(c) 2018 Intel Corporation > * > - * Portions of this file are derived from the ipw3945 project, as well > - * as portions of the ieee80211 subsystem header files. > - * > * This program is free software; you can redistribute it and/or modify it > * under the terms of version 2 of the GNU General Public License as > * published by the Free Software Foundation. > @@ -18,12 +20,46 @@ > * more details. > * > * The full GNU General Public License is included in this distribution in the > - * file called LICENSE. > + * file called COPYING. > * > * Contact Information: > * Intel Linux Wireless <linuxwifi@intel.com> > * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 > * > + * BSD LICENSE > + * > + * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved. > + * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH > + * Copyright(c) 2016 - 2017 Intel Deutschland GmbH > + * Copyright(c) 2018 Intel Corporation > + * All rights reserved. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * > + * * Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * * Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in > + * the documentation and/or other materials provided with the > + * distribution. > + * * Neither the name Intel Corporation nor the names of its > + * contributors may be used to endorse or promote products derived > + * from this software without specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT > + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, > + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT > + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, > + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY > + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + * > *****************************************************************************/ > #include <linux/etherdevice.h> > #include <linux/ieee80211.h> > -- > 2.17.2 >
On Wed, 2018-10-24 at 09:33 +0200, Sedat Dilek wrote: > > > Align the licenses with their permission to clean up and to > > make it all identical. > > > > Does it make sense to put the BSD license (text) in a separate file > (like GPL) and reference it? I agree that it would, and in fact we already have it available to reference with the SPDX in the LICENSES directory. However, no files of the iwlwifi driver currently do that, and I'd prefer doing that sort of cleanup more generally as a separate step. johannes
On Wed, Oct 24, 2018 at 9:36 AM Johannes Berg <johannes@sipsolutions.net> wrote: > > On Wed, 2018-10-24 at 09:33 +0200, Sedat Dilek wrote: > > > > > Align the licenses with their permission to clean up and to > > > make it all identical. > > > > > > > Does it make sense to put the BSD license (text) in a separate file > > (like GPL) and reference it? > > I agree that it would, and in fact we already have it available to > reference with the SPDX in the LICENSES directory. > > However, no files of the iwlwifi driver currently do that, and I'd > prefer doing that sort of cleanup more generally as a separate step. > Sounds good to me. - Sedat -
On Wed, Oct 24, 2018 at 12:05 AM Johannes Berg <johannes@sipsolutions.net> wrote: > > From: Johannes Berg <johannes.berg@intel.com> > > These files have a long history of code changes, but analysing > the remaining code leads to having only a few changes that are > not already owned by Intel, notably from > - Andy Lutomirski <luto@amacapital.net> > - Joonwoo Park <joonwpark81@gmail.com> > - Kirtika Ruchandani <kirtika@chromium.org> > - Rajat Jain <rajatja@google.com> > - Stanislaw Gruszka <sgruszka@redhat.com> > remaining in the code today. > > Note that > - I myself was working for Intel and for any possibly code > that might be before my employment there give permission > - Wizery employees were working for Intel > > More specifically, we identified the following commits that > (partially may) remain today: > > 25c03d8e8c13 Joonwoo Park <joonwpark81@gmail.com> ("iwlwifi: do not schedule tasklet when rcv unused irq") > f36d04abe684 Stanislaw Gruszka <sgruszka@redhat.com> ("iwlwifi: use dma_alloc_coherent") > 387f3381f732 Stanislaw Gruszka <sgruszka@redhat.com> ("iwlwifi: fix dma mappings and skbs leak") > 2624e96ce16b Stanislaw Gruszka <sgruszka@redhat.com> ("iwlwifi: fix possible data overwrite in hcmd callback") > bfe4b80e9f73 Stanislaw Gruszka <sgruszka@redhat.com> ("iwlwifi: always check if got h/w access before write") > d536c32b45d2 Andy Lutomirski <luto@amacapital.net> ("iwlwifi: pcie: log when waking the NIC for hcmd submission fails") > a6d24fad00d9 Rajat Jain <rajatja@google.com> ("iwlwifi: pcie: dump registers when HW becomes inaccessible") > fb12777ab59b Kirtika Ruchandani <kirtika@chromium.org> ("iwlwifi: Add more call-sites for pcie reg dumper") > 3a73a30049f2 Stanislaw Gruszka <sgruszka@redhat.com> ("iwlwifi: cleanup/fix memory barriers") > aa5affbacb24 Stanislaw Gruszka <sgruszka@redhat.com> ("iwlwifi: dump stack when fail to gain access to the device") > > Align the licenses with their permission to clean up and to > make it all identical. > > CC: Joonwoo Park <joonwpark81@gmail.com> > CC: Stanislaw Gruszka <sgruszka@redhat.com> > CC: Andy Lutomirski <luto@amacapital.net> > CC: Rajat Jain <rajatja@google.com> > CC: Kirtika Ruchandani <kirtika@chromium.org> > Acked-by: Johannes Berg <johannes@sipsolutions.net> Acked-by: Kirtika Ruchandani <kirtika@chromium.org> > Signed-off-by: Johannes Berg <johannes.berg@intel.com> > --- > I'd appreciate if you (in CC lines) could provide your acked-by here. > --- > drivers/net/wireless/intel/iwlwifi/iwl-io.c | 41 +++++++++++++++-- > drivers/net/wireless/intel/iwlwifi/iwl-io.h | 38 ++++++++++++++-- > .../wireless/intel/iwlwifi/pcie/internal.h | 44 +++++++++++++++++-- > drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 44 +++++++++++++++++-- > drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 44 +++++++++++++++++-- > 5 files changed, 192 insertions(+), 19 deletions(-) > > diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-io.c b/drivers/net/wireless/intel/iwlwifi/iwl-io.c > index 4f10914f6048..ffd1e649bfa0 100644 > --- a/drivers/net/wireless/intel/iwlwifi/iwl-io.c > +++ b/drivers/net/wireless/intel/iwlwifi/iwl-io.c > @@ -1,10 +1,13 @@ > /****************************************************************************** > + * > + * This file is provided under a dual BSD/GPLv2 license. When using or > + * redistributing this file, you may do so under either license. > + * > + * GPL LICENSE SUMMARY > * > * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved. > * Copyright(c) 2015 - 2016 Intel Deutschland GmbH > * > - * Portions of this file are derived from the ipw3945 project. > - * > * This program is free software; you can redistribute it and/or modify it > * under the terms of version 2 of the GNU General Public License as > * published by the Free Software Foundation. > @@ -15,12 +18,44 @@ > * more details. > * > * The full GNU General Public License is included in this distribution in the > - * file called LICENSE. > + * file called COPYING. > * > * Contact Information: > * Intel Linux Wireless <linuxwifi@intel.com> > * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 > * > + * BSD LICENSE > + * > + * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved. > + * Copyright(c) 2015 - 2016 Intel Deutschland GmbH > + * All rights reserved. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * > + * * Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * * Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in > + * the documentation and/or other materials provided with the > + * distribution. > + * * Neither the name Intel Corporation nor the names of its > + * contributors may be used to endorse or promote products derived > + * from this software without specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT > + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, > + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT > + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, > + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY > + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + * > *****************************************************************************/ > #include <linux/delay.h> > #include <linux/device.h> > diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-io.h b/drivers/net/wireless/intel/iwlwifi/iwl-io.h > index 38085850a2d3..61477e58352d 100644 > --- a/drivers/net/wireless/intel/iwlwifi/iwl-io.h > +++ b/drivers/net/wireless/intel/iwlwifi/iwl-io.h > @@ -1,8 +1,9 @@ > /****************************************************************************** > * > - * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved. > + * This file is provided under a dual BSD/GPLv2 license. When using or > + * redistributing this file, you may do so under either license. > * > - * Portions of this file are derived from the ipw3945 project. > + * GPL LICENSE SUMMARY > * > * This program is free software; you can redistribute it and/or modify it > * under the terms of version 2 of the GNU General Public License as > @@ -14,14 +15,43 @@ > * more details. > * > * The full GNU General Public License is included in this distribution in the > - * file called LICENSE. > + * file called COPYING. > * > * Contact Information: > * Intel Linux Wireless <linuxwifi@intel.com> > * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 > * > + * BSD LICENSE > + * > + * All rights reserved. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * > + * * Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * * Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in > + * the documentation and/or other materials provided with the > + * distribution. > + * * Neither the name Intel Corporation nor the names of its > + * contributors may be used to endorse or promote products derived > + * from this software without specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT > + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, > + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT > + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, > + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY > + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + * > *****************************************************************************/ > - > #ifndef __iwl_io_h__ > #define __iwl_io_h__ > > diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h > index f9c4c64dee66..6821d09df8db 100644 > --- a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h > +++ b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h > @@ -1,13 +1,15 @@ > /****************************************************************************** > + * > + * This file is provided under a dual BSD/GPLv2 license. When using or > + * redistributing this file, you may do so under either license. > + * > + * GPL LICENSE SUMMARY > * > * Copyright(c) 2003 - 2015 Intel Corporation. All rights reserved. > * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH > * Copyright(c) 2016 - 2017 Intel Deutschland GmbH > * Copyright(c) 2018 Intel Corporation > * > - * Portions of this file are derived from the ipw3945 project, as well > - * as portions of the ieee80211 subsystem header files. > - * > * This program is free software; you can redistribute it and/or modify it > * under the terms of version 2 of the GNU General Public License as > * published by the Free Software Foundation. > @@ -18,12 +20,46 @@ > * more details. > * > * The full GNU General Public License is included in this distribution in the > - * file called LICENSE. > + * file called COPYING. > * > * Contact Information: > * Intel Linux Wireless <linuxwifi@intel.com> > * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 > * > + * BSD LICENSE > + * > + * Copyright(c) 2003 - 2015 Intel Corporation. All rights reserved. > + * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH > + * Copyright(c) 2016 - 2017 Intel Deutschland GmbH > + * Copyright(c) 2018 Intel Corporation > + * All rights reserved. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * > + * * Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * * Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in > + * the documentation and/or other materials provided with the > + * distribution. > + * * Neither the name Intel Corporation nor the names of its > + * contributors may be used to endorse or promote products derived > + * from this software without specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT > + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, > + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT > + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, > + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY > + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + * > *****************************************************************************/ > #ifndef __iwl_trans_int_pcie_h__ > #define __iwl_trans_int_pcie_h__ > diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c > index e965cc588850..f4ad89aeaa0a 100644 > --- a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c > +++ b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c > @@ -1,13 +1,15 @@ > /****************************************************************************** > + * > + * This file is provided under a dual BSD/GPLv2 license. When using or > + * redistributing this file, you may do so under either license. > + * > + * GPL LICENSE SUMMARY > * > * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved. > * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH > * Copyright(c) 2016 - 2017 Intel Deutschland GmbH > * Copyright(c) 2018 Intel Corporation > * > - * Portions of this file are derived from the ipw3945 project, as well > - * as portions of the ieee80211 subsystem header files. > - * > * This program is free software; you can redistribute it and/or modify it > * under the terms of version 2 of the GNU General Public License as > * published by the Free Software Foundation. > @@ -18,12 +20,46 @@ > * more details. > * > * The full GNU General Public License is included in this distribution in the > - * file called LICENSE. > + * file called COPYING. > * > * Contact Information: > * Intel Linux Wireless <linuxwifi@intel.com> > * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 > * > + * BSD LICENSE > + * > + * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved. > + * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH > + * Copyright(c) 2016 - 2017 Intel Deutschland GmbH > + * Copyright(c) 2018 Intel Corporation > + * All rights reserved. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * > + * * Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * * Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in > + * the documentation and/or other materials provided with the > + * distribution. > + * * Neither the name Intel Corporation nor the names of its > + * contributors may be used to endorse or promote products derived > + * from this software without specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT > + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, > + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT > + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, > + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY > + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + * > *****************************************************************************/ > #include <linux/sched.h> > #include <linux/wait.h> > diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c > index f227b91098c9..60487d11eaa8 100644 > --- a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c > +++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c > @@ -1,13 +1,15 @@ > /****************************************************************************** > + * > + * This file is provided under a dual BSD/GPLv2 license. When using or > + * redistributing this file, you may do so under either license. > + * > + * GPL LICENSE SUMMARY > * > * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved. > * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH > * Copyright(c) 2016 - 2017 Intel Deutschland GmbH > * Copyright(c) 2018 Intel Corporation > * > - * Portions of this file are derived from the ipw3945 project, as well > - * as portions of the ieee80211 subsystem header files. > - * > * This program is free software; you can redistribute it and/or modify it > * under the terms of version 2 of the GNU General Public License as > * published by the Free Software Foundation. > @@ -18,12 +20,46 @@ > * more details. > * > * The full GNU General Public License is included in this distribution in the > - * file called LICENSE. > + * file called COPYING. > * > * Contact Information: > * Intel Linux Wireless <linuxwifi@intel.com> > * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 > * > + * BSD LICENSE > + * > + * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved. > + * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH > + * Copyright(c) 2016 - 2017 Intel Deutschland GmbH > + * Copyright(c) 2018 Intel Corporation > + * All rights reserved. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * > + * * Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * * Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in > + * the documentation and/or other materials provided with the > + * distribution. > + * * Neither the name Intel Corporation nor the names of its > + * contributors may be used to endorse or promote products derived > + * from this software without specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT > + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, > + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT > + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, > + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY > + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + * > *****************************************************************************/ > #include <linux/etherdevice.h> > #include <linux/ieee80211.h> > -- > 2.17.2 >
On Wed, Oct 24, 2018 at 09:04:36AM +0200, Johannes Berg wrote: > From: Johannes Berg <johannes.berg@intel.com> > > These files have a long history of code changes, but analysing > the remaining code leads to having only a few changes that are > not already owned by Intel, notably from > - Andy Lutomirski <luto@amacapital.net> > - Joonwoo Park <joonwpark81@gmail.com> > - Kirtika Ruchandani <kirtika@chromium.org> > - Rajat Jain <rajatja@google.com> > - Stanislaw Gruszka <sgruszka@redhat.com> > remaining in the code today. > > Note that > - I myself was working for Intel and for any possibly code > that might be before my employment there give permission > - Wizery employees were working for Intel > > More specifically, we identified the following commits that > (partially may) remain today: > > 25c03d8e8c13 Joonwoo Park <joonwpark81@gmail.com> ("iwlwifi: do not schedule tasklet when rcv unused irq") > f36d04abe684 Stanislaw Gruszka <sgruszka@redhat.com> ("iwlwifi: use dma_alloc_coherent") > 387f3381f732 Stanislaw Gruszka <sgruszka@redhat.com> ("iwlwifi: fix dma mappings and skbs leak") > 2624e96ce16b Stanislaw Gruszka <sgruszka@redhat.com> ("iwlwifi: fix possible data overwrite in hcmd callback") > bfe4b80e9f73 Stanislaw Gruszka <sgruszka@redhat.com> ("iwlwifi: always check if got h/w access before write") > d536c32b45d2 Andy Lutomirski <luto@amacapital.net> ("iwlwifi: pcie: log when waking the NIC for hcmd submission fails") > a6d24fad00d9 Rajat Jain <rajatja@google.com> ("iwlwifi: pcie: dump registers when HW becomes inaccessible") > fb12777ab59b Kirtika Ruchandani <kirtika@chromium.org> ("iwlwifi: Add more call-sites for pcie reg dumper") > 3a73a30049f2 Stanislaw Gruszka <sgruszka@redhat.com> ("iwlwifi: cleanup/fix memory barriers") > aa5affbacb24 Stanislaw Gruszka <sgruszka@redhat.com> ("iwlwifi: dump stack when fail to gain access to the device") > > Align the licenses with their permission to clean up and to > make it all identical. > > CC: Joonwoo Park <joonwpark81@gmail.com> > CC: Stanislaw Gruszka <sgruszka@redhat.com> > CC: Andy Lutomirski <luto@amacapital.net> > CC: Rajat Jain <rajatja@google.com> > CC: Kirtika Ruchandani <kirtika@chromium.org> > Acked-by: Johannes Berg <johannes@sipsolutions.net> > Signed-off-by: Johannes Berg <johannes.berg@intel.com> Acked-by: Stanislaw Gruszka <sgruszka@redhat.com>
Acked-by: Joonwoo Park <joonwpark81@gmail.com> On Wed, Oct 24, 2018 at 6:22 AM Stanislaw Gruszka <sgruszka@redhat.com> wrote: > > On Wed, Oct 24, 2018 at 09:04:36AM +0200, Johannes Berg wrote: > > From: Johannes Berg <johannes.berg@intel.com> > > > > These files have a long history of code changes, but analysing > > the remaining code leads to having only a few changes that are > > not already owned by Intel, notably from > > - Andy Lutomirski <luto@amacapital.net> > > - Joonwoo Park <joonwpark81@gmail.com> > > - Kirtika Ruchandani <kirtika@chromium.org> > > - Rajat Jain <rajatja@google.com> > > - Stanislaw Gruszka <sgruszka@redhat.com> > > remaining in the code today. > > > > Note that > > - I myself was working for Intel and for any possibly code > > that might be before my employment there give permission > > - Wizery employees were working for Intel > > > > More specifically, we identified the following commits that > > (partially may) remain today: > > > > 25c03d8e8c13 Joonwoo Park <joonwpark81@gmail.com> ("iwlwifi: do not schedule tasklet when rcv unused irq") > > f36d04abe684 Stanislaw Gruszka <sgruszka@redhat.com> ("iwlwifi: use dma_alloc_coherent") > > 387f3381f732 Stanislaw Gruszka <sgruszka@redhat.com> ("iwlwifi: fix dma mappings and skbs leak") > > 2624e96ce16b Stanislaw Gruszka <sgruszka@redhat.com> ("iwlwifi: fix possible data overwrite in hcmd callback") > > bfe4b80e9f73 Stanislaw Gruszka <sgruszka@redhat.com> ("iwlwifi: always check if got h/w access before write") > > d536c32b45d2 Andy Lutomirski <luto@amacapital.net> ("iwlwifi: pcie: log when waking the NIC for hcmd submission fails") > > a6d24fad00d9 Rajat Jain <rajatja@google.com> ("iwlwifi: pcie: dump registers when HW becomes inaccessible") > > fb12777ab59b Kirtika Ruchandani <kirtika@chromium.org> ("iwlwifi: Add more call-sites for pcie reg dumper") > > 3a73a30049f2 Stanislaw Gruszka <sgruszka@redhat.com> ("iwlwifi: cleanup/fix memory barriers") > > aa5affbacb24 Stanislaw Gruszka <sgruszka@redhat.com> ("iwlwifi: dump stack when fail to gain access to the device") > > > > Align the licenses with their permission to clean up and to > > make it all identical. > > > > CC: Joonwoo Park <joonwpark81@gmail.com> > > CC: Stanislaw Gruszka <sgruszka@redhat.com> > > CC: Andy Lutomirski <luto@amacapital.net> > > CC: Rajat Jain <rajatja@google.com> > > CC: Kirtika Ruchandani <kirtika@chromium.org> > > Acked-by: Johannes Berg <johannes@sipsolutions.net> > > Signed-off-by: Johannes Berg <johannes.berg@intel.com> > > Acked-by: Stanislaw Gruszka <sgruszka@redhat.com>
On Wed, Oct 24, 2018 at 12:05 AM Johannes Berg <johannes@sipsolutions.net> wrote: > > From: Johannes Berg <johannes.berg@intel.com> > > These files have a long history of code changes, but analysing > the remaining code leads to having only a few changes that are > not already owned by Intel, notably from > - Andy Lutomirski <luto@amacapital.net> > - Joonwoo Park <joonwpark81@gmail.com> > - Kirtika Ruchandani <kirtika@chromium.org> > - Rajat Jain <rajatja@google.com> > - Stanislaw Gruszka <sgruszka@redhat.com> > remaining in the code today. > > Note that > - I myself was working for Intel and for any possibly code > that might be before my employment there give permission > - Wizery employees were working for Intel > > More specifically, we identified the following commits that > (partially may) remain today: > > 25c03d8e8c13 Joonwoo Park <joonwpark81@gmail.com> ("iwlwifi: do not schedule tasklet when rcv unused irq") > f36d04abe684 Stanislaw Gruszka <sgruszka@redhat.com> ("iwlwifi: use dma_alloc_coherent") > 387f3381f732 Stanislaw Gruszka <sgruszka@redhat.com> ("iwlwifi: fix dma mappings and skbs leak") > 2624e96ce16b Stanislaw Gruszka <sgruszka@redhat.com> ("iwlwifi: fix possible data overwrite in hcmd callback") > bfe4b80e9f73 Stanislaw Gruszka <sgruszka@redhat.com> ("iwlwifi: always check if got h/w access before write") > d536c32b45d2 Andy Lutomirski <luto@amacapital.net> ("iwlwifi: pcie: log when waking the NIC for hcmd submission fails") > a6d24fad00d9 Rajat Jain <rajatja@google.com> ("iwlwifi: pcie: dump registers when HW becomes inaccessible") > fb12777ab59b Kirtika Ruchandani <kirtika@chromium.org> ("iwlwifi: Add more call-sites for pcie reg dumper") > 3a73a30049f2 Stanislaw Gruszka <sgruszka@redhat.com> ("iwlwifi: cleanup/fix memory barriers") > aa5affbacb24 Stanislaw Gruszka <sgruszka@redhat.com> ("iwlwifi: dump stack when fail to gain access to the device") > > Align the licenses with their permission to clean up and to > make it all identical. > > CC: Joonwoo Park <joonwpark81@gmail.com> > CC: Stanislaw Gruszka <sgruszka@redhat.com> > CC: Andy Lutomirski <luto@amacapital.net> > CC: Rajat Jain <rajatja@google.com> > CC: Kirtika Ruchandani <kirtika@chromium.org> > Acked-by: Johannes Berg <johannes@sipsolutions.net> > Signed-off-by: Johannes Berg <johannes.berg@intel.com> Acked-by: Rajat Jain <rajatja@google.com> > --- > I'd appreciate if you (in CC lines) could provide your acked-by here. > --- > drivers/net/wireless/intel/iwlwifi/iwl-io.c | 41 +++++++++++++++-- > drivers/net/wireless/intel/iwlwifi/iwl-io.h | 38 ++++++++++++++-- > .../wireless/intel/iwlwifi/pcie/internal.h | 44 +++++++++++++++++-- > drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 44 +++++++++++++++++-- > drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 44 +++++++++++++++++-- > 5 files changed, 192 insertions(+), 19 deletions(-) > > diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-io.c b/drivers/net/wireless/intel/iwlwifi/iwl-io.c > index 4f10914f6048..ffd1e649bfa0 100644 > --- a/drivers/net/wireless/intel/iwlwifi/iwl-io.c > +++ b/drivers/net/wireless/intel/iwlwifi/iwl-io.c > @@ -1,10 +1,13 @@ > /****************************************************************************** > + * > + * This file is provided under a dual BSD/GPLv2 license. When using or > + * redistributing this file, you may do so under either license. > + * > + * GPL LICENSE SUMMARY > * > * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved. > * Copyright(c) 2015 - 2016 Intel Deutschland GmbH > * > - * Portions of this file are derived from the ipw3945 project. > - * > * This program is free software; you can redistribute it and/or modify it > * under the terms of version 2 of the GNU General Public License as > * published by the Free Software Foundation. > @@ -15,12 +18,44 @@ > * more details. > * > * The full GNU General Public License is included in this distribution in the > - * file called LICENSE. > + * file called COPYING. > * > * Contact Information: > * Intel Linux Wireless <linuxwifi@intel.com> > * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 > * > + * BSD LICENSE > + * > + * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved. > + * Copyright(c) 2015 - 2016 Intel Deutschland GmbH > + * All rights reserved. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * > + * * Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * * Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in > + * the documentation and/or other materials provided with the > + * distribution. > + * * Neither the name Intel Corporation nor the names of its > + * contributors may be used to endorse or promote products derived > + * from this software without specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT > + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, > + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT > + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, > + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY > + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + * > *****************************************************************************/ > #include <linux/delay.h> > #include <linux/device.h> > diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-io.h b/drivers/net/wireless/intel/iwlwifi/iwl-io.h > index 38085850a2d3..61477e58352d 100644 > --- a/drivers/net/wireless/intel/iwlwifi/iwl-io.h > +++ b/drivers/net/wireless/intel/iwlwifi/iwl-io.h > @@ -1,8 +1,9 @@ > /****************************************************************************** > * > - * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved. > + * This file is provided under a dual BSD/GPLv2 license. When using or > + * redistributing this file, you may do so under either license. > * > - * Portions of this file are derived from the ipw3945 project. > + * GPL LICENSE SUMMARY > * > * This program is free software; you can redistribute it and/or modify it > * under the terms of version 2 of the GNU General Public License as > @@ -14,14 +15,43 @@ > * more details. > * > * The full GNU General Public License is included in this distribution in the > - * file called LICENSE. > + * file called COPYING. > * > * Contact Information: > * Intel Linux Wireless <linuxwifi@intel.com> > * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 > * > + * BSD LICENSE > + * > + * All rights reserved. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * > + * * Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * * Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in > + * the documentation and/or other materials provided with the > + * distribution. > + * * Neither the name Intel Corporation nor the names of its > + * contributors may be used to endorse or promote products derived > + * from this software without specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT > + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, > + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT > + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, > + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY > + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + * > *****************************************************************************/ > - > #ifndef __iwl_io_h__ > #define __iwl_io_h__ > > diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h > index f9c4c64dee66..6821d09df8db 100644 > --- a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h > +++ b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h > @@ -1,13 +1,15 @@ > /****************************************************************************** > + * > + * This file is provided under a dual BSD/GPLv2 license. When using or > + * redistributing this file, you may do so under either license. > + * > + * GPL LICENSE SUMMARY > * > * Copyright(c) 2003 - 2015 Intel Corporation. All rights reserved. > * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH > * Copyright(c) 2016 - 2017 Intel Deutschland GmbH > * Copyright(c) 2018 Intel Corporation > * > - * Portions of this file are derived from the ipw3945 project, as well > - * as portions of the ieee80211 subsystem header files. > - * > * This program is free software; you can redistribute it and/or modify it > * under the terms of version 2 of the GNU General Public License as > * published by the Free Software Foundation. > @@ -18,12 +20,46 @@ > * more details. > * > * The full GNU General Public License is included in this distribution in the > - * file called LICENSE. > + * file called COPYING. > * > * Contact Information: > * Intel Linux Wireless <linuxwifi@intel.com> > * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 > * > + * BSD LICENSE > + * > + * Copyright(c) 2003 - 2015 Intel Corporation. All rights reserved. > + * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH > + * Copyright(c) 2016 - 2017 Intel Deutschland GmbH > + * Copyright(c) 2018 Intel Corporation > + * All rights reserved. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * > + * * Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * * Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in > + * the documentation and/or other materials provided with the > + * distribution. > + * * Neither the name Intel Corporation nor the names of its > + * contributors may be used to endorse or promote products derived > + * from this software without specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT > + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, > + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT > + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, > + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY > + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + * > *****************************************************************************/ > #ifndef __iwl_trans_int_pcie_h__ > #define __iwl_trans_int_pcie_h__ > diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c > index e965cc588850..f4ad89aeaa0a 100644 > --- a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c > +++ b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c > @@ -1,13 +1,15 @@ > /****************************************************************************** > + * > + * This file is provided under a dual BSD/GPLv2 license. When using or > + * redistributing this file, you may do so under either license. > + * > + * GPL LICENSE SUMMARY > * > * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved. > * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH > * Copyright(c) 2016 - 2017 Intel Deutschland GmbH > * Copyright(c) 2018 Intel Corporation > * > - * Portions of this file are derived from the ipw3945 project, as well > - * as portions of the ieee80211 subsystem header files. > - * > * This program is free software; you can redistribute it and/or modify it > * under the terms of version 2 of the GNU General Public License as > * published by the Free Software Foundation. > @@ -18,12 +20,46 @@ > * more details. > * > * The full GNU General Public License is included in this distribution in the > - * file called LICENSE. > + * file called COPYING. > * > * Contact Information: > * Intel Linux Wireless <linuxwifi@intel.com> > * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 > * > + * BSD LICENSE > + * > + * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved. > + * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH > + * Copyright(c) 2016 - 2017 Intel Deutschland GmbH > + * Copyright(c) 2018 Intel Corporation > + * All rights reserved. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * > + * * Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * * Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in > + * the documentation and/or other materials provided with the > + * distribution. > + * * Neither the name Intel Corporation nor the names of its > + * contributors may be used to endorse or promote products derived > + * from this software without specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT > + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, > + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT > + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, > + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY > + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + * > *****************************************************************************/ > #include <linux/sched.h> > #include <linux/wait.h> > diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c > index f227b91098c9..60487d11eaa8 100644 > --- a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c > +++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c > @@ -1,13 +1,15 @@ > /****************************************************************************** > + * > + * This file is provided under a dual BSD/GPLv2 license. When using or > + * redistributing this file, you may do so under either license. > + * > + * GPL LICENSE SUMMARY > * > * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved. > * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH > * Copyright(c) 2016 - 2017 Intel Deutschland GmbH > * Copyright(c) 2018 Intel Corporation > * > - * Portions of this file are derived from the ipw3945 project, as well > - * as portions of the ieee80211 subsystem header files. > - * > * This program is free software; you can redistribute it and/or modify it > * under the terms of version 2 of the GNU General Public License as > * published by the Free Software Foundation. > @@ -18,12 +20,46 @@ > * more details. > * > * The full GNU General Public License is included in this distribution in the > - * file called LICENSE. > + * file called COPYING. > * > * Contact Information: > * Intel Linux Wireless <linuxwifi@intel.com> > * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 > * > + * BSD LICENSE > + * > + * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved. > + * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH > + * Copyright(c) 2016 - 2017 Intel Deutschland GmbH > + * Copyright(c) 2018 Intel Corporation > + * All rights reserved. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * > + * * Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * * Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in > + * the documentation and/or other materials provided with the > + * distribution. > + * * Neither the name Intel Corporation nor the names of its > + * contributors may be used to endorse or promote products derived > + * from this software without specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT > + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, > + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT > + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, > + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY > + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + * > *****************************************************************************/ > #include <linux/etherdevice.h> > #include <linux/ieee80211.h> > -- > 2.17.2 >
On Wed, Oct 24, 2018 at 12:05 AM Johannes Berg <johannes@sipsolutions.net> wrote: > > From: Johannes Berg <johannes.berg@intel.com> > > These files have a long history of code changes, but analysing > the remaining code leads to having only a few changes that are > not already owned by Intel, notably from > - Andy Lutomirski <luto@amacapital.net> > - Joonwoo Park <joonwpark81@gmail.com> > - Kirtika Ruchandani <kirtika@chromium.org> > - Rajat Jain <rajatja@google.com> > - Stanislaw Gruszka <sgruszka@redhat.com> > remaining in the code today. > Acked-by: Andy Lutomirski <luto@kernel.org>
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-io.c b/drivers/net/wireless/intel/iwlwifi/iwl-io.c index 4f10914f6048..ffd1e649bfa0 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-io.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-io.c @@ -1,10 +1,13 @@ /****************************************************************************** + * + * This file is provided under a dual BSD/GPLv2 license. When using or + * redistributing this file, you may do so under either license. + * + * GPL LICENSE SUMMARY * * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved. * Copyright(c) 2015 - 2016 Intel Deutschland GmbH * - * Portions of this file are derived from the ipw3945 project. - * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. @@ -15,12 +18,44 @@ * more details. * * The full GNU General Public License is included in this distribution in the - * file called LICENSE. + * file called COPYING. * * Contact Information: * Intel Linux Wireless <linuxwifi@intel.com> * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 * + * BSD LICENSE + * + * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved. + * Copyright(c) 2015 - 2016 Intel Deutschland GmbH + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * *****************************************************************************/ #include <linux/delay.h> #include <linux/device.h> diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-io.h b/drivers/net/wireless/intel/iwlwifi/iwl-io.h index 38085850a2d3..61477e58352d 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-io.h +++ b/drivers/net/wireless/intel/iwlwifi/iwl-io.h @@ -1,8 +1,9 @@ /****************************************************************************** * - * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved. + * This file is provided under a dual BSD/GPLv2 license. When using or + * redistributing this file, you may do so under either license. * - * Portions of this file are derived from the ipw3945 project. + * GPL LICENSE SUMMARY * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as @@ -14,14 +15,43 @@ * more details. * * The full GNU General Public License is included in this distribution in the - * file called LICENSE. + * file called COPYING. * * Contact Information: * Intel Linux Wireless <linuxwifi@intel.com> * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 * + * BSD LICENSE + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * *****************************************************************************/ - #ifndef __iwl_io_h__ #define __iwl_io_h__ diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h index f9c4c64dee66..6821d09df8db 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h +++ b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h @@ -1,13 +1,15 @@ /****************************************************************************** + * + * This file is provided under a dual BSD/GPLv2 license. When using or + * redistributing this file, you may do so under either license. + * + * GPL LICENSE SUMMARY * * Copyright(c) 2003 - 2015 Intel Corporation. All rights reserved. * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH * Copyright(c) 2016 - 2017 Intel Deutschland GmbH * Copyright(c) 2018 Intel Corporation * - * Portions of this file are derived from the ipw3945 project, as well - * as portions of the ieee80211 subsystem header files. - * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. @@ -18,12 +20,46 @@ * more details. * * The full GNU General Public License is included in this distribution in the - * file called LICENSE. + * file called COPYING. * * Contact Information: * Intel Linux Wireless <linuxwifi@intel.com> * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 * + * BSD LICENSE + * + * Copyright(c) 2003 - 2015 Intel Corporation. All rights reserved. + * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH + * Copyright(c) 2016 - 2017 Intel Deutschland GmbH + * Copyright(c) 2018 Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * *****************************************************************************/ #ifndef __iwl_trans_int_pcie_h__ #define __iwl_trans_int_pcie_h__ diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c index e965cc588850..f4ad89aeaa0a 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c @@ -1,13 +1,15 @@ /****************************************************************************** + * + * This file is provided under a dual BSD/GPLv2 license. When using or + * redistributing this file, you may do so under either license. + * + * GPL LICENSE SUMMARY * * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved. * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH * Copyright(c) 2016 - 2017 Intel Deutschland GmbH * Copyright(c) 2018 Intel Corporation * - * Portions of this file are derived from the ipw3945 project, as well - * as portions of the ieee80211 subsystem header files. - * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. @@ -18,12 +20,46 @@ * more details. * * The full GNU General Public License is included in this distribution in the - * file called LICENSE. + * file called COPYING. * * Contact Information: * Intel Linux Wireless <linuxwifi@intel.com> * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 * + * BSD LICENSE + * + * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved. + * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH + * Copyright(c) 2016 - 2017 Intel Deutschland GmbH + * Copyright(c) 2018 Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * *****************************************************************************/ #include <linux/sched.h> #include <linux/wait.h> diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c index f227b91098c9..60487d11eaa8 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c @@ -1,13 +1,15 @@ /****************************************************************************** + * + * This file is provided under a dual BSD/GPLv2 license. When using or + * redistributing this file, you may do so under either license. + * + * GPL LICENSE SUMMARY * * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved. * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH * Copyright(c) 2016 - 2017 Intel Deutschland GmbH * Copyright(c) 2018 Intel Corporation * - * Portions of this file are derived from the ipw3945 project, as well - * as portions of the ieee80211 subsystem header files. - * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. @@ -18,12 +20,46 @@ * more details. * * The full GNU General Public License is included in this distribution in the - * file called LICENSE. + * file called COPYING. * * Contact Information: * Intel Linux Wireless <linuxwifi@intel.com> * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 * + * BSD LICENSE + * + * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved. + * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH + * Copyright(c) 2016 - 2017 Intel Deutschland GmbH + * Copyright(c) 2018 Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * *****************************************************************************/ #include <linux/etherdevice.h> #include <linux/ieee80211.h>