| Message ID | 3a5cb822eb4cd81d32b5480f1235c992ea4fbe06.1587193872.git.ryder.lee@mediatek.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Felix Fietkau |
| Headers | show |
| Series | mt76: fix different licenses in same driver | expand |
Hi Ryder, I think for this patch we need an explicit ACK from Stanislaw Gruszka and Jakub Kicinski (both Cc'd), because mt76x0 was licensed under GPL. - Felix On 2020-04-18 09:28, Ryder Lee wrote: > Avoid using different licenses in the same driver. > > Signed-off-by: Ryder Lee <ryder.lee@mediatek.com> > --- > drivers/net/wireless/mediatek/mt76/Kconfig | 2 +- > drivers/net/wireless/mediatek/mt76/Makefile | 2 +- > drivers/net/wireless/mediatek/mt76/mt7603/Kconfig | 2 +- > drivers/net/wireless/mediatek/mt76/mt7603/Makefile | 2 +- > drivers/net/wireless/mediatek/mt76/mt7615/Kconfig | 2 +- > drivers/net/wireless/mediatek/mt76/mt7615/usb_init.c | 2 +- > drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c | 2 +- > drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig | 2 +- > drivers/net/wireless/mediatek/mt76/mt76x0/Makefile | 2 +- > drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c | 2 +- > drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h | 2 +- > drivers/net/wireless/mediatek/mt76/mt76x0/init.c | 2 +- > drivers/net/wireless/mediatek/mt76/mt76x0/initvals.h | 2 +- > drivers/net/wireless/mediatek/mt76/mt76x0/initvals_phy.h | 2 +- > drivers/net/wireless/mediatek/mt76/mt76x0/main.c | 2 +- > drivers/net/wireless/mediatek/mt76/mt76x0/mcu.h | 2 +- > drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h | 2 +- > drivers/net/wireless/mediatek/mt76/mt76x0/phy.c | 2 +- > drivers/net/wireless/mediatek/mt76/mt76x0/phy.h | 2 +- > drivers/net/wireless/mediatek/mt76/mt76x0/usb.c | 2 +- > drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig | 2 +- > drivers/net/wireless/mediatek/mt76/mt76x2/Makefile | 2 +- > 22 files changed, 22 insertions(+), 22 deletions(-) > > diff --git a/drivers/net/wireless/mediatek/mt76/Kconfig b/drivers/net/wireless/mediatek/mt76/Kconfig > index cbc2d8a5d354..6e522bfca20a 100644 > --- a/drivers/net/wireless/mediatek/mt76/Kconfig > +++ b/drivers/net/wireless/mediatek/mt76/Kconfig > @@ -1,4 +1,4 @@ > -# SPDX-License-Identifier: GPL-2.0-only > +# SPDX-License-Identifier: ISC > config MT76_CORE > tristate > > diff --git a/drivers/net/wireless/mediatek/mt76/Makefile b/drivers/net/wireless/mediatek/mt76/Makefile > index a1dfafec431b..32238349ec81 100644 > --- a/drivers/net/wireless/mediatek/mt76/Makefile > +++ b/drivers/net/wireless/mediatek/mt76/Makefile > @@ -1,4 +1,4 @@ > -# SPDX-License-Identifier: GPL-2.0-only > +# SPDX-License-Identifier: ISC > obj-$(CONFIG_MT76_CORE) += mt76.o > obj-$(CONFIG_MT76_USB) += mt76-usb.o > obj-$(CONFIG_MT76x02_LIB) += mt76x02-lib.o > diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/Kconfig b/drivers/net/wireless/mediatek/mt76/mt7603/Kconfig > index 6a0080f1d91c..8bf53244472c 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7603/Kconfig > +++ b/drivers/net/wireless/mediatek/mt76/mt7603/Kconfig > @@ -1,4 +1,4 @@ > -# SPDX-License-Identifier: GPL-2.0-only > +# SPDX-License-Identifier: ISC > config MT7603E > tristate "MediaTek MT7603E (PCIe) and MT76x8 WLAN support" > select MT76_CORE > diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/Makefile b/drivers/net/wireless/mediatek/mt76/mt7603/Makefile > index 6878e305c24d..0e5539fa4ef2 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7603/Makefile > +++ b/drivers/net/wireless/mediatek/mt76/mt7603/Makefile > @@ -1,4 +1,4 @@ > -# SPDX-License-Identifier: GPL-2.0-only > +# SPDX-License-Identifier: ISC > obj-$(CONFIG_MT7603E) += mt7603e.o > > mt7603e-y := \ > diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/Kconfig b/drivers/net/wireless/mediatek/mt76/mt7615/Kconfig > index e25db1135eda..d84548d5e000 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7615/Kconfig > +++ b/drivers/net/wireless/mediatek/mt76/mt7615/Kconfig > @@ -1,4 +1,4 @@ > -# SPDX-License-Identifier: GPL-2.0-only > +# SPDX-License-Identifier: ISC > > config MT7615_COMMON > tristate > diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/usb_init.c b/drivers/net/wireless/mediatek/mt76/mt7615/usb_init.c > index 39642065531f..747f4b61e6da 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7615/usb_init.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7615/usb_init.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: ISC > /* Copyright (C) 2019 MediaTek Inc. > * > * Author: Felix Fietkau <nbd@nbd.name> > diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c > index cd709fd617db..36c47500eb5b 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: ISC > /* Copyright (C) 2019 MediaTek Inc. > * > * Author: Felix Fietkau <nbd@nbd.name> > diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig b/drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig > index 7c88ed8b8f1e..408ebe6e67a8 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig > +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig > @@ -1,4 +1,4 @@ > -# SPDX-License-Identifier: GPL-2.0-only > +# SPDX-License-Identifier: ISC > config MT76x0_COMMON > tristate > select MT76x02_LIB > diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/Makefile b/drivers/net/wireless/mediatek/mt76/mt76x0/Makefile > index 8dcfb4cb4fdf..d6388e63c46e 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt76x0/Makefile > +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/Makefile > @@ -1,4 +1,4 @@ > -# SPDX-License-Identifier: GPL-2.0-only > +# SPDX-License-Identifier: ISC > obj-$(CONFIG_MT76x0U) += mt76x0u.o > obj-$(CONFIG_MT76x0E) += mt76x0e.o > obj-$(CONFIG_MT76x0_COMMON) += mt76x0-common.o > diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c b/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c > index 9087607b621e..ff70d30eebaa 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c > +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0-only > +// SPDX-License-Identifier: ISC > /* > * Copyright (C) 2014 Felix Fietkau <nbd@openwrt.org> > * Copyright (C) 2015 Jakub Kicinski <kubakici@wp.pl> > diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h b/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h > index 15540ce8db87..c9ddb47101ec 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h > +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h > @@ -1,4 +1,4 @@ > -/* SPDX-License-Identifier: GPL-2.0-only */ > +/* SPDX-License-Identifier: ISC */ > /* > * Copyright (C) 2014 Felix Fietkau <nbd@openwrt.org> > * Copyright (C) 2015 Jakub Kicinski <kubakici@wp.pl> > diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/init.c b/drivers/net/wireless/mediatek/mt76/mt76x0/init.c > index 57f8d56737eb..76c9ba4c3b00 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt76x0/init.c > +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/init.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0-only > +// SPDX-License-Identifier: ISC > /* > * (c) Copyright 2002-2010, Ralink Technology, Inc. > * Copyright (C) 2014 Felix Fietkau <nbd@openwrt.org> > diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/initvals.h b/drivers/net/wireless/mediatek/mt76/mt76x0/initvals.h > index 3dcd9620a126..fef58c4589c1 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt76x0/initvals.h > +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/initvals.h > @@ -1,4 +1,4 @@ > -/* SPDX-License-Identifier: GPL-2.0-only */ > +/* SPDX-License-Identifier: ISC */ > /* > * (c) Copyright 2002-2010, Ralink Technology, Inc. > * Copyright (C) 2015 Jakub Kicinski <kubakici@wp.pl> > diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/initvals_phy.h b/drivers/net/wireless/mediatek/mt76/mt76x0/initvals_phy.h > index 42a79887bf79..93f82c320468 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt76x0/initvals_phy.h > +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/initvals_phy.h > @@ -1,4 +1,4 @@ > -/* SPDX-License-Identifier: GPL-2.0-only */ > +/* SPDX-License-Identifier: ISC */ > /* > * (c) Copyright 2002-2010, Ralink Technology, Inc. > * Copyright (C) 2015 Jakub Kicinski <kubakici@wp.pl> > diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/main.c b/drivers/net/wireless/mediatek/mt76/mt76x0/main.c > index 700ae9c12f1d..8243033dcb98 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt76x0/main.c > +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/main.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0-only > +// SPDX-License-Identifier: ISC > /* > * Copyright (C) 2014 Felix Fietkau <nbd@openwrt.org> > * Copyright (C) 2015 Jakub Kicinski <kubakici@wp.pl> > diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/mcu.h b/drivers/net/wireless/mediatek/mt76/mt76x0/mcu.h > index 0ef29f15f866..706158b504e9 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt76x0/mcu.h > +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/mcu.h > @@ -1,4 +1,4 @@ > -/* SPDX-License-Identifier: GPL-2.0-only */ > +/* SPDX-License-Identifier: ISC */ > /* > * Copyright (C) 2014 Felix Fietkau <nbd@openwrt.org> > * Copyright (C) 2015 Jakub Kicinski <kubakici@wp.pl> > diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h b/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h > index 6953f253a28a..c5eae232a031 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h > +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h > @@ -1,4 +1,4 @@ > -/* SPDX-License-Identifier: GPL-2.0-only */ > +/* SPDX-License-Identifier: ISC */ > /* > * Copyright (C) 2014 Felix Fietkau <nbd@openwrt.org> > * Copyright (C) 2015 Jakub Kicinski <kubakici@wp.pl> > diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c > index 09f34deb6ba1..aa2e48c7a605 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c > +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0-only > +// SPDX-License-Identifier: ISC > /* > * (c) Copyright 2002-2010, Ralink Technology, Inc. > * Copyright (C) 2014 Felix Fietkau <nbd@openwrt.org> > diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.h b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.h > index 441d6559d4fd..fcedde763779 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.h > +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.h > @@ -1,4 +1,4 @@ > -/* SPDX-License-Identifier: GPL-2.0-only */ > +/* SPDX-License-Identifier: ISC */ > /* > * (c) Copyright 2002-2010, Ralink Technology, Inc. > * Copyright (C) 2018 Stanislaw Gruszka <stf_xl@wp.pl> > diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c > index 5535b9c0632f..e844b34d3f74 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c > +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0-only > +// SPDX-License-Identifier: ISC > /* > * Copyright (C) 2015 Jakub Kicinski <kubakici@wp.pl> > */ > diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig b/drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig > index 5fd4973e32df..0b6f9fcc3c54 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig > +++ b/drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig > @@ -1,4 +1,4 @@ > -# SPDX-License-Identifier: GPL-2.0-only > +# SPDX-License-Identifier: ISC > config MT76x2_COMMON > tristate > select MT76x02_LIB > diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/Makefile b/drivers/net/wireless/mediatek/mt76/mt76x2/Makefile > index caf089538c11..893d872d6196 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt76x2/Makefile > +++ b/drivers/net/wireless/mediatek/mt76/mt76x2/Makefile > @@ -1,4 +1,4 @@ > -# SPDX-License-Identifier: GPL-2.0-only > +# SPDX-License-Identifier: ISC > obj-$(CONFIG_MT76x2_COMMON) += mt76x2-common.o > obj-$(CONFIG_MT76x2E) += mt76x2e.o > obj-$(CONFIG_MT76x2U) += mt76x2u.o >
On Thu, 7 May 2020 15:30:24 +0200 Felix Fietkau wrote: > Hi Ryder, > > I think for this patch we need an explicit ACK from Stanislaw Gruszka > and Jakub Kicinski (both Cc'd), because mt76x0 was licensed under GPL. Thanks, yes, you definitely need an ack, especially from folks who have their copyright on the files :/ My personal preference for the license was expressed clearly when the code was written and it is GPL-only. Felix, if you prefer the clean up I'm happy to ack, but I see no reason to downgrade the license at vendor's request.
Jakub Kicinski <kubakici@wp.pl> writes: > On Thu, 7 May 2020 15:30:24 +0200 Felix Fietkau wrote: >> Hi Ryder, >> >> I think for this patch we need an explicit ACK from Stanislaw Gruszka >> and Jakub Kicinski (both Cc'd), because mt76x0 was licensed under GPL. > > Thanks, yes, you definitely need an ack, especially from folks who have > their copyright on the files :/ > > My personal preference for the license was expressed clearly when the > code was written and it is GPL-only. Felix, if you prefer the clean up > I'm happy to ack, but I see no reason to downgrade the license at > vendor's request. I think it would be unfortunate to have different licenses in the same driver. For example think of copying a function from one file to another, how would we handle that? So my strong recommendation is to use the same license throughout the driver. And in this case I consider mt76 directory and it's subdirectories as being one driver, please correct me if that's not the case.
On Thu, 14 May 2020 07:03:45 +0300 Kalle Valo wrote: > Jakub Kicinski <kubakici@wp.pl> writes: > > On Thu, 7 May 2020 15:30:24 +0200 Felix Fietkau wrote: > >> Hi Ryder, > >> > >> I think for this patch we need an explicit ACK from Stanislaw Gruszka > >> and Jakub Kicinski (both Cc'd), because mt76x0 was licensed under GPL. > > > > Thanks, yes, you definitely need an ack, especially from folks who have > > their copyright on the files :/ > > > > My personal preference for the license was expressed clearly when the > > code was written and it is GPL-only. Felix, if you prefer the clean up > > I'm happy to ack, but I see no reason to downgrade the license at > > vendor's request. > > I think it would be unfortunate to have different licenses in the same > driver. For example think of copying a function from one file to > another, how would we handle that? So my strong recommendation is to use > the same license throughout the driver. And in this case I consider mt76 > directory and it's subdirectories as being one driver, please correct me > if that's not the case. AFAIU some parts of the code were brought in from mt7601u which has a different license. As I said I'm happy with it if Felix feels like it's needed. Just not a fan of vendors who barely contribute making license changes.
diff --git a/drivers/net/wireless/mediatek/mt76/Kconfig b/drivers/net/wireless/mediatek/mt76/Kconfig index cbc2d8a5d354..6e522bfca20a 100644 --- a/drivers/net/wireless/mediatek/mt76/Kconfig +++ b/drivers/net/wireless/mediatek/mt76/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0-only +# SPDX-License-Identifier: ISC config MT76_CORE tristate diff --git a/drivers/net/wireless/mediatek/mt76/Makefile b/drivers/net/wireless/mediatek/mt76/Makefile index a1dfafec431b..32238349ec81 100644 --- a/drivers/net/wireless/mediatek/mt76/Makefile +++ b/drivers/net/wireless/mediatek/mt76/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0-only +# SPDX-License-Identifier: ISC obj-$(CONFIG_MT76_CORE) += mt76.o obj-$(CONFIG_MT76_USB) += mt76-usb.o obj-$(CONFIG_MT76x02_LIB) += mt76x02-lib.o diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/Kconfig b/drivers/net/wireless/mediatek/mt76/mt7603/Kconfig index 6a0080f1d91c..8bf53244472c 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7603/Kconfig +++ b/drivers/net/wireless/mediatek/mt76/mt7603/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0-only +# SPDX-License-Identifier: ISC config MT7603E tristate "MediaTek MT7603E (PCIe) and MT76x8 WLAN support" select MT76_CORE diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/Makefile b/drivers/net/wireless/mediatek/mt76/mt7603/Makefile index 6878e305c24d..0e5539fa4ef2 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7603/Makefile +++ b/drivers/net/wireless/mediatek/mt76/mt7603/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0-only +# SPDX-License-Identifier: ISC obj-$(CONFIG_MT7603E) += mt7603e.o mt7603e-y := \ diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/Kconfig b/drivers/net/wireless/mediatek/mt76/mt7615/Kconfig index e25db1135eda..d84548d5e000 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/Kconfig +++ b/drivers/net/wireless/mediatek/mt76/mt7615/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0-only +# SPDX-License-Identifier: ISC config MT7615_COMMON tristate diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/usb_init.c b/drivers/net/wireless/mediatek/mt76/mt7615/usb_init.c index 39642065531f..747f4b61e6da 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/usb_init.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/usb_init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: ISC /* Copyright (C) 2019 MediaTek Inc. * * Author: Felix Fietkau <nbd@nbd.name> diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c index cd709fd617db..36c47500eb5b 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: ISC /* Copyright (C) 2019 MediaTek Inc. * * Author: Felix Fietkau <nbd@nbd.name> diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig b/drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig index 7c88ed8b8f1e..408ebe6e67a8 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0-only +# SPDX-License-Identifier: ISC config MT76x0_COMMON tristate select MT76x02_LIB diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/Makefile b/drivers/net/wireless/mediatek/mt76/mt76x0/Makefile index 8dcfb4cb4fdf..d6388e63c46e 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x0/Makefile +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0-only +# SPDX-License-Identifier: ISC obj-$(CONFIG_MT76x0U) += mt76x0u.o obj-$(CONFIG_MT76x0E) += mt76x0e.o obj-$(CONFIG_MT76x0_COMMON) += mt76x0-common.o diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c b/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c index 9087607b621e..ff70d30eebaa 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0-only +// SPDX-License-Identifier: ISC /* * Copyright (C) 2014 Felix Fietkau <nbd@openwrt.org> * Copyright (C) 2015 Jakub Kicinski <kubakici@wp.pl> diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h b/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h index 15540ce8db87..c9ddb47101ec 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-License-Identifier: ISC */ /* * Copyright (C) 2014 Felix Fietkau <nbd@openwrt.org> * Copyright (C) 2015 Jakub Kicinski <kubakici@wp.pl> diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/init.c b/drivers/net/wireless/mediatek/mt76/mt76x0/init.c index 57f8d56737eb..76c9ba4c3b00 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x0/init.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0-only +// SPDX-License-Identifier: ISC /* * (c) Copyright 2002-2010, Ralink Technology, Inc. * Copyright (C) 2014 Felix Fietkau <nbd@openwrt.org> diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/initvals.h b/drivers/net/wireless/mediatek/mt76/mt76x0/initvals.h index 3dcd9620a126..fef58c4589c1 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x0/initvals.h +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/initvals.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-License-Identifier: ISC */ /* * (c) Copyright 2002-2010, Ralink Technology, Inc. * Copyright (C) 2015 Jakub Kicinski <kubakici@wp.pl> diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/initvals_phy.h b/drivers/net/wireless/mediatek/mt76/mt76x0/initvals_phy.h index 42a79887bf79..93f82c320468 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x0/initvals_phy.h +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/initvals_phy.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-License-Identifier: ISC */ /* * (c) Copyright 2002-2010, Ralink Technology, Inc. * Copyright (C) 2015 Jakub Kicinski <kubakici@wp.pl> diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/main.c b/drivers/net/wireless/mediatek/mt76/mt76x0/main.c index 700ae9c12f1d..8243033dcb98 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x0/main.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/main.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0-only +// SPDX-License-Identifier: ISC /* * Copyright (C) 2014 Felix Fietkau <nbd@openwrt.org> * Copyright (C) 2015 Jakub Kicinski <kubakici@wp.pl> diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/mcu.h b/drivers/net/wireless/mediatek/mt76/mt76x0/mcu.h index 0ef29f15f866..706158b504e9 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x0/mcu.h +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/mcu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-License-Identifier: ISC */ /* * Copyright (C) 2014 Felix Fietkau <nbd@openwrt.org> * Copyright (C) 2015 Jakub Kicinski <kubakici@wp.pl> diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h b/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h index 6953f253a28a..c5eae232a031 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-License-Identifier: ISC */ /* * Copyright (C) 2014 Felix Fietkau <nbd@openwrt.org> * Copyright (C) 2015 Jakub Kicinski <kubakici@wp.pl> diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c index 09f34deb6ba1..aa2e48c7a605 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0-only +// SPDX-License-Identifier: ISC /* * (c) Copyright 2002-2010, Ralink Technology, Inc. * Copyright (C) 2014 Felix Fietkau <nbd@openwrt.org> diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.h b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.h index 441d6559d4fd..fcedde763779 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.h +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-License-Identifier: ISC */ /* * (c) Copyright 2002-2010, Ralink Technology, Inc. * Copyright (C) 2018 Stanislaw Gruszka <stf_xl@wp.pl> diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c index 5535b9c0632f..e844b34d3f74 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0-only +// SPDX-License-Identifier: ISC /* * Copyright (C) 2015 Jakub Kicinski <kubakici@wp.pl> */ diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig b/drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig index 5fd4973e32df..0b6f9fcc3c54 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig +++ b/drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0-only +# SPDX-License-Identifier: ISC config MT76x2_COMMON tristate select MT76x02_LIB diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/Makefile b/drivers/net/wireless/mediatek/mt76/mt76x2/Makefile index caf089538c11..893d872d6196 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x2/Makefile +++ b/drivers/net/wireless/mediatek/mt76/mt76x2/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0-only +# SPDX-License-Identifier: ISC obj-$(CONFIG_MT76x2_COMMON) += mt76x2-common.o obj-$(CONFIG_MT76x2E) += mt76x2e.o obj-$(CONFIG_MT76x2U) += mt76x2u.o
Avoid using different licenses in the same driver. Signed-off-by: Ryder Lee <ryder.lee@mediatek.com> --- drivers/net/wireless/mediatek/mt76/Kconfig | 2 +- drivers/net/wireless/mediatek/mt76/Makefile | 2 +- drivers/net/wireless/mediatek/mt76/mt7603/Kconfig | 2 +- drivers/net/wireless/mediatek/mt76/mt7603/Makefile | 2 +- drivers/net/wireless/mediatek/mt76/mt7615/Kconfig | 2 +- drivers/net/wireless/mediatek/mt76/mt7615/usb_init.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig | 2 +- drivers/net/wireless/mediatek/mt76/mt76x0/Makefile | 2 +- drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h | 2 +- drivers/net/wireless/mediatek/mt76/mt76x0/init.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76x0/initvals.h | 2 +- drivers/net/wireless/mediatek/mt76/mt76x0/initvals_phy.h | 2 +- drivers/net/wireless/mediatek/mt76/mt76x0/main.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76x0/mcu.h | 2 +- drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h | 2 +- drivers/net/wireless/mediatek/mt76/mt76x0/phy.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76x0/phy.h | 2 +- drivers/net/wireless/mediatek/mt76/mt76x0/usb.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig | 2 +- drivers/net/wireless/mediatek/mt76/mt76x2/Makefile | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-)