* [PATCH net-next 1/2] net: dwc-xlgmac: declaration of dual license in headers
@ 2017-03-23 4:03 Jie Deng
2017-03-23 4:03 ` [PATCH net-next 2/2] net: dwc-xlgmac: use dual license Jie Deng
2017-03-24 0:04 ` [PATCH net-next 1/2] net: dwc-xlgmac: declaration of dual license in headers David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Jie Deng @ 2017-03-23 4:03 UTC (permalink / raw)
To: davem; +Cc: arnd, netdev, linux-kernel, Jie Deng
The driver "dwc-xlgmac" is dual-licensed. This patch adds
declaration of dual license in file headers.
Signed-off-by: Jie Deng <jiedeng@synopsys.com>
---
drivers/net/ethernet/synopsys/dwc-xlgmac-common.c | 6 ++----
drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c | 6 ++----
drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c | 6 ++----
drivers/net/ethernet/synopsys/dwc-xlgmac-net.c | 6 ++----
drivers/net/ethernet/synopsys/dwc-xlgmac-pci.c | 6 ++----
drivers/net/ethernet/synopsys/dwc-xlgmac-reg.h | 6 ++----
drivers/net/ethernet/synopsys/dwc-xlgmac.h | 6 ++----
7 files changed, 14 insertions(+), 28 deletions(-)
diff --git a/drivers/net/ethernet/synopsys/dwc-xlgmac-common.c b/drivers/net/ethernet/synopsys/dwc-xlgmac-common.c
index b72196a..cb11928 100644
--- a/drivers/net/ethernet/synopsys/dwc-xlgmac-common.c
+++ b/drivers/net/ethernet/synopsys/dwc-xlgmac-common.c
@@ -2,10 +2,8 @@
*
* Copyright (c) 2017 Synopsys, Inc. (www.synopsys.com)
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
+ * This program is dual-licensed; you may select either version 2 of
+ * the GNU General Public License ("GPL") or BSD license ("BSD").
*
* This Synopsys DWC XLGMAC software driver and associated documentation
* (hereinafter the "Software") is an unsupported proprietary work of
diff --git a/drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c b/drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c
index 39b5cb9..e9672b1 100644
--- a/drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c
+++ b/drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c
@@ -2,10 +2,8 @@
*
* Copyright (c) 2017 Synopsys, Inc. (www.synopsys.com)
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
+ * This program is dual-licensed; you may select either version 2 of
+ * the GNU General Public License ("GPL") or BSD license ("BSD").
*
* This Synopsys DWC XLGMAC software driver and associated documentation
* (hereinafter the "Software") is an unsupported proprietary work of
diff --git a/drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c b/drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c
index 1e25a86..0dec1dc 100644
--- a/drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c
+++ b/drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c
@@ -2,10 +2,8 @@
*
* Copyright (c) 2017 Synopsys, Inc. (www.synopsys.com)
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
+ * This program is dual-licensed; you may select either version 2 of
+ * the GNU General Public License ("GPL") or BSD license ("BSD").
*
* This Synopsys DWC XLGMAC software driver and associated documentation
* (hereinafter the "Software") is an unsupported proprietary work of
diff --git a/drivers/net/ethernet/synopsys/dwc-xlgmac-net.c b/drivers/net/ethernet/synopsys/dwc-xlgmac-net.c
index 5e8428b..6acf86c 100644
--- a/drivers/net/ethernet/synopsys/dwc-xlgmac-net.c
+++ b/drivers/net/ethernet/synopsys/dwc-xlgmac-net.c
@@ -2,10 +2,8 @@
*
* Copyright (c) 2017 Synopsys, Inc. (www.synopsys.com)
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
+ * This program is dual-licensed; you may select either version 2 of
+ * the GNU General Public License ("GPL") or BSD license ("BSD").
*
* This Synopsys DWC XLGMAC software driver and associated documentation
* (hereinafter the "Software") is an unsupported proprietary work of
diff --git a/drivers/net/ethernet/synopsys/dwc-xlgmac-pci.c b/drivers/net/ethernet/synopsys/dwc-xlgmac-pci.c
index 504e80d..386bafe 100644
--- a/drivers/net/ethernet/synopsys/dwc-xlgmac-pci.c
+++ b/drivers/net/ethernet/synopsys/dwc-xlgmac-pci.c
@@ -2,10 +2,8 @@
*
* Copyright (c) 2017 Synopsys, Inc. (www.synopsys.com)
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
+ * This program is dual-licensed; you may select either version 2 of
+ * the GNU General Public License ("GPL") or BSD license ("BSD").
*
* This Synopsys DWC XLGMAC software driver and associated documentation
* (hereinafter the "Software") is an unsupported proprietary work of
diff --git a/drivers/net/ethernet/synopsys/dwc-xlgmac-reg.h b/drivers/net/ethernet/synopsys/dwc-xlgmac-reg.h
index 7824481..3754f22 100644
--- a/drivers/net/ethernet/synopsys/dwc-xlgmac-reg.h
+++ b/drivers/net/ethernet/synopsys/dwc-xlgmac-reg.h
@@ -2,10 +2,8 @@
*
* Copyright (c) 2017 Synopsys, Inc. (www.synopsys.com)
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
+ * This program is dual-licensed; you may select either version 2 of
+ * the GNU General Public License ("GPL") or BSD license ("BSD").
*
* This Synopsys DWC XLGMAC software driver and associated documentation
* (hereinafter the "Software") is an unsupported proprietary work of
diff --git a/drivers/net/ethernet/synopsys/dwc-xlgmac.h b/drivers/net/ethernet/synopsys/dwc-xlgmac.h
index 7a4dc64..676b2fb8 100644
--- a/drivers/net/ethernet/synopsys/dwc-xlgmac.h
+++ b/drivers/net/ethernet/synopsys/dwc-xlgmac.h
@@ -2,10 +2,8 @@
*
* Copyright (c) 2017 Synopsys, Inc. (www.synopsys.com)
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
+ * This program is dual-licensed; you may select either version 2 of
+ * the GNU General Public License ("GPL") or BSD license ("BSD").
*
* This Synopsys DWC XLGMAC software driver and associated documentation
* (hereinafter the "Software") is an unsupported proprietary work of
--
1.9.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH net-next 2/2] net: dwc-xlgmac: use dual license
2017-03-23 4:03 [PATCH net-next 1/2] net: dwc-xlgmac: declaration of dual license in headers Jie Deng
@ 2017-03-23 4:03 ` Jie Deng
2017-03-24 0:04 ` David Miller
2017-03-24 0:04 ` [PATCH net-next 1/2] net: dwc-xlgmac: declaration of dual license in headers David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Jie Deng @ 2017-03-23 4:03 UTC (permalink / raw)
To: davem; +Cc: arnd, netdev, linux-kernel, Jie Deng
The driver "dwc-xlgmac" is dual-licensed.
Declare the dual license with MODULE_LICENSE().
Signed-off-by: Jie Deng <jiedeng@synopsys.com>
---
drivers/net/ethernet/synopsys/dwc-xlgmac-common.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/synopsys/dwc-xlgmac-common.c b/drivers/net/ethernet/synopsys/dwc-xlgmac-common.c
index cb11928..07def2b 100644
--- a/drivers/net/ethernet/synopsys/dwc-xlgmac-common.c
+++ b/drivers/net/ethernet/synopsys/dwc-xlgmac-common.c
@@ -21,9 +21,10 @@
#include "dwc-xlgmac.h"
#include "dwc-xlgmac-reg.h"
+MODULE_LICENSE("Dual BSD/GPL");
+
static int debug = -1;
module_param(debug, int, 0644);
-MODULE_LICENSE("GPL");
MODULE_PARM_DESC(debug, "DWC ethernet debug level (0=none,...,16=all)");
static const u32 default_msg_level = (NETIF_MSG_LINK | NETIF_MSG_IFDOWN |
NETIF_MSG_IFUP);
--
1.9.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net-next 1/2] net: dwc-xlgmac: declaration of dual license in headers
2017-03-23 4:03 [PATCH net-next 1/2] net: dwc-xlgmac: declaration of dual license in headers Jie Deng
2017-03-23 4:03 ` [PATCH net-next 2/2] net: dwc-xlgmac: use dual license Jie Deng
@ 2017-03-24 0:04 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2017-03-24 0:04 UTC (permalink / raw)
To: Jie.Deng1; +Cc: arnd, netdev, linux-kernel
From: Jie Deng <Jie.Deng1@synopsys.com>
Date: Thu, 23 Mar 2017 12:03:45 +0800
> The driver "dwc-xlgmac" is dual-licensed. This patch adds
> declaration of dual license in file headers.
>
> Signed-off-by: Jie Deng <jiedeng@synopsys.com>
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net-next 2/2] net: dwc-xlgmac: use dual license
2017-03-23 4:03 ` [PATCH net-next 2/2] net: dwc-xlgmac: use dual license Jie Deng
@ 2017-03-24 0:04 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2017-03-24 0:04 UTC (permalink / raw)
To: Jie.Deng1; +Cc: arnd, netdev, linux-kernel
From: Jie Deng <Jie.Deng1@synopsys.com>
Date: Thu, 23 Mar 2017 12:03:46 +0800
> The driver "dwc-xlgmac" is dual-licensed.
> Declare the dual license with MODULE_LICENSE().
>
> Signed-off-by: Jie Deng <jiedeng@synopsys.com>
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-03-24 0:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-23 4:03 [PATCH net-next 1/2] net: dwc-xlgmac: declaration of dual license in headers Jie Deng
2017-03-23 4:03 ` [PATCH net-next 2/2] net: dwc-xlgmac: use dual license Jie Deng
2017-03-24 0:04 ` David Miller
2017-03-24 0:04 ` [PATCH net-next 1/2] net: dwc-xlgmac: declaration of dual license in headers David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®