On Tue, 2020-04-21 at 12:18 +0300, Kalle Valo wrote: > Luca Coelho <luca@xxxxxxxxx> writes: > > > From: Mordechay Goodstein <mordechay.goodstein@xxxxxxxxx> > > > > The API version lookup is parsed from a TLV and should be in shared code > > make make it reusable across all opmodes. > > > > Also change the function names from mvm to fw, since this is not > > mvm-specific anymore. > > > > Additionally, since this function is not just a single line of code, it > > shouldn't be inline. Convert them to actual functions. > > > > Signed-off-by: Mordechay Goodstein <mordechay.goodstein@xxxxxxxxx> > > Signed-off-by: Luca Coelho <luciano.coelho@xxxxxxxxx> > > [...] > > > +++ b/drivers/net/wireless/intel/iwlwifi/fw/img.c > > @@ -0,0 +1,100 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > +/****************************************************************************** > > + * > > + * 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) 2019 Intel Corporation > > + * > > + * 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. > > + * > > + * This program is distributed in the hope that it will be useful, but > > + * WITHOUT ANY WARRANTY; without even the implied warranty of > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > > + * General Public License for more details. > > + * > > + * The full GNU General Public License is included in this distribution > > + * in the file called COPYING. > > + * > > + * Contact Information: > > + * Intel Linux Wireless <linuxwifi@xxxxxxxxx> > > + * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 > > + * > > + * BSD LICENSE > > + * > > + * Copyright(c) 2019 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. > > + *****************************************************************************/ > > This doesn't look correct. You shouldn't have the actual license text if > you have SPDX tags. Also SPDX claims this is "GPL" but the license text > itself says "GPL or BSD" and they contradict each other. Oops, you're right. We weren't using the SPDX tags yet at this point and I missed the fact that it was added (wrongly) there. I'll remove it from this patch for now. We will start using the SPDX tags everywhere soon. -- Luca.
