2017-03-23 04:04:23

by Jie Deng

Subject: [PATCH net-next 1/2] net: dwc-xlgmac: declaration of dual license in headers

The driver "dwc-xlgmac" is dual-licensed. This patch adds
declaration of dual license in file headers.

Signed-off-by: Jie Deng <[email protected]>
---
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. (http://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. (http://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. (http://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. (http://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. (http://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. (http://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. (http://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

2017-03-23 04:05:10

by Jie Deng

Subject: [PATCH net-next 2/2] net: dwc-xlgmac: use dual license

The driver "dwc-xlgmac" is dual-licensed.
Declare the dual license with MODULE_LICENSE().

Signed-off-by: Jie Deng <[email protected]>
---
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

2017-03-24 00:04:27

by David Miller

Subject: Re: [PATCH net-next 1/2] net: dwc-xlgmac: declaration of dual license in headers

From: Jie Deng <[email protected]>
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 <[email protected]>

Applied.

2017-03-24 00:04:32

by David Miller

Subject: Re: [PATCH net-next 2/2] net: dwc-xlgmac: use dual license

From: Jie Deng <[email protected]>
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 <[email protected]>

Applied.