aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Brandeburg <jesse.brandeburg@intel.com>2018-09-14 20:37:57 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2018-09-18 18:32:59 -0400
commit98674ebec892a77c06b2b107dd417f3d43a6637d (patch)
treeea2fa7dcc4cc16e055511632f636b32818ecb42e
parent66bc8e0f591a4bb00d6d0423dde6ab839045eaf9 (diff)
intel-ethernet: use correct module license
We recently updated all our SPDX identifiers to correctly indicate our net/ethernet/intel/* drivers were always released and intended to be released under GPL v2, but the MODULE_LICENSE declaration was never updated. Fix the MODULE_LICENSE to be GPL v2, for all our drivers. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Tested-by: Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/e100.c2
-rw-r--r--drivers/net/ethernet/intel/e1000/e1000_main.c2
-rw-r--r--drivers/net/ethernet/intel/e1000e/netdev.c2
-rw-r--r--drivers/net/ethernet/intel/fm10k/fm10k_main.c2
-rw-r--r--drivers/net/ethernet/intel/i40e/i40e_main.c2
-rw-r--r--drivers/net/ethernet/intel/iavf/iavf_main.c4
-rw-r--r--drivers/net/ethernet/intel/ice/ice_main.c2
-rw-r--r--drivers/net/ethernet/intel/igb/igb_main.c2
-rw-r--r--drivers/net/ethernet/intel/igbvf/netdev.c2
-rw-r--r--drivers/net/ethernet/intel/ixgb/ixgb_main.c2
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_main.c2
-rw-r--r--drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c2
12 files changed, 13 insertions, 13 deletions
diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
index 27d5f27163d2..7c4b55482f72 100644
--- a/drivers/net/ethernet/intel/e100.c
+++ b/drivers/net/ethernet/intel/e100.c
@@ -164,7 +164,7 @@
164 164
165MODULE_DESCRIPTION(DRV_DESCRIPTION); 165MODULE_DESCRIPTION(DRV_DESCRIPTION);
166MODULE_AUTHOR(DRV_COPYRIGHT); 166MODULE_AUTHOR(DRV_COPYRIGHT);
167MODULE_LICENSE("GPL"); 167MODULE_LICENSE("GPL v2");
168MODULE_VERSION(DRV_VERSION); 168MODULE_VERSION(DRV_VERSION);
169MODULE_FIRMWARE(FIRMWARE_D101M); 169MODULE_FIRMWARE(FIRMWARE_D101M);
170MODULE_FIRMWARE(FIRMWARE_D101S); 170MODULE_FIRMWARE(FIRMWARE_D101S);
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 2110d5f2da19..7e0f1f96a8a1 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -195,7 +195,7 @@ static struct pci_driver e1000_driver = {
195 195
196MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>"); 196MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
197MODULE_DESCRIPTION("Intel(R) PRO/1000 Network Driver"); 197MODULE_DESCRIPTION("Intel(R) PRO/1000 Network Driver");
198MODULE_LICENSE("GPL"); 198MODULE_LICENSE("GPL v2");
199MODULE_VERSION(DRV_VERSION); 199MODULE_VERSION(DRV_VERSION);
200 200
201#define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV|NETIF_MSG_PROBE|NETIF_MSG_LINK) 201#define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV|NETIF_MSG_PROBE|NETIF_MSG_LINK)
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 3ba0c90e7055..c0f9faca70c4 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -7592,7 +7592,7 @@ module_exit(e1000_exit_module);
7592 7592
7593MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>"); 7593MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
7594MODULE_DESCRIPTION("Intel(R) PRO/1000 Network Driver"); 7594MODULE_DESCRIPTION("Intel(R) PRO/1000 Network Driver");
7595MODULE_LICENSE("GPL"); 7595MODULE_LICENSE("GPL v2");
7596MODULE_VERSION(DRV_VERSION); 7596MODULE_VERSION(DRV_VERSION);
7597 7597
7598/* netdev.c */ 7598/* netdev.c */
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
index 3f536541f45f..503bbc017792 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
@@ -21,7 +21,7 @@ static const char fm10k_copyright[] =
21 21
22MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>"); 22MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
23MODULE_DESCRIPTION(DRV_SUMMARY); 23MODULE_DESCRIPTION(DRV_SUMMARY);
24MODULE_LICENSE("GPL"); 24MODULE_LICENSE("GPL v2");
25MODULE_VERSION(DRV_VERSION); 25MODULE_VERSION(DRV_VERSION);
26 26
27/* single workqueue for entire fm10k driver */ 27/* single workqueue for entire fm10k driver */
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 5d209d8fe9b8..c7d2c9010fdf 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -91,7 +91,7 @@ MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all), Debug mask (0x8XXXXXXX
91 91
92MODULE_AUTHOR("Intel Corporation, <e1000-devel@lists.sourceforge.net>"); 92MODULE_AUTHOR("Intel Corporation, <e1000-devel@lists.sourceforge.net>");
93MODULE_DESCRIPTION("Intel(R) Ethernet Connection XL710 Network Driver"); 93MODULE_DESCRIPTION("Intel(R) Ethernet Connection XL710 Network Driver");
94MODULE_LICENSE("GPL"); 94MODULE_LICENSE("GPL v2");
95MODULE_VERSION(DRV_VERSION); 95MODULE_VERSION(DRV_VERSION);
96 96
97static struct workqueue_struct *i40e_wq; 97static struct workqueue_struct *i40e_wq;
diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c
index 59bb9de713f7..8c71c698a2ef 100644
--- a/drivers/net/ethernet/intel/iavf/iavf_main.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_main.c
@@ -53,8 +53,8 @@ MODULE_DEVICE_TABLE(pci, iavf_pci_tbl);
53 53
54MODULE_ALIAS("i40evf"); 54MODULE_ALIAS("i40evf");
55MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>"); 55MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
56MODULE_DESCRIPTION("Intel(R) XL710 X710 Virtual Function Network Driver"); 56MODULE_DESCRIPTION("Intel(R) Ethernet Adaptive Virtual Function Network Driver");
57MODULE_LICENSE("GPL"); 57MODULE_LICENSE("GPL v2");
58MODULE_VERSION(DRV_VERSION); 58MODULE_VERSION(DRV_VERSION);
59 59
60static struct workqueue_struct *iavf_wq; 60static struct workqueue_struct *iavf_wq;
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 1b49a605d094..d54e63785ff0 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -15,7 +15,7 @@ static const char ice_copyright[] = "Copyright (c) 2018, Intel Corporation.";
15 15
16MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>"); 16MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
17MODULE_DESCRIPTION(DRV_SUMMARY); 17MODULE_DESCRIPTION(DRV_SUMMARY);
18MODULE_LICENSE("GPL"); 18MODULE_LICENSE("GPL v2");
19MODULE_VERSION(DRV_VERSION); 19MODULE_VERSION(DRV_VERSION);
20 20
21static int debug = -1; 21static int debug = -1;
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index a32c576c1e65..c18e79112cad 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -243,7 +243,7 @@ static struct pci_driver igb_driver = {
243 243
244MODULE_AUTHOR("Intel Corporation, <e1000-devel@lists.sourceforge.net>"); 244MODULE_AUTHOR("Intel Corporation, <e1000-devel@lists.sourceforge.net>");
245MODULE_DESCRIPTION("Intel(R) Gigabit Ethernet Network Driver"); 245MODULE_DESCRIPTION("Intel(R) Gigabit Ethernet Network Driver");
246MODULE_LICENSE("GPL"); 246MODULE_LICENSE("GPL v2");
247MODULE_VERSION(DRV_VERSION); 247MODULE_VERSION(DRV_VERSION);
248 248
249#define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV|NETIF_MSG_PROBE|NETIF_MSG_LINK) 249#define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV|NETIF_MSG_PROBE|NETIF_MSG_LINK)
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index e0c989ffb2b3..820d49eb41ab 100644
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -3011,7 +3011,7 @@ module_exit(igbvf_exit_module);
3011 3011
3012MODULE_AUTHOR("Intel Corporation, <e1000-devel@lists.sourceforge.net>"); 3012MODULE_AUTHOR("Intel Corporation, <e1000-devel@lists.sourceforge.net>");
3013MODULE_DESCRIPTION("Intel(R) Gigabit Virtual Function Network Driver"); 3013MODULE_DESCRIPTION("Intel(R) Gigabit Virtual Function Network Driver");
3014MODULE_LICENSE("GPL"); 3014MODULE_LICENSE("GPL v2");
3015MODULE_VERSION(DRV_VERSION); 3015MODULE_VERSION(DRV_VERSION);
3016 3016
3017/* netdev.c */ 3017/* netdev.c */
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
index d3e72d0f66ef..4bb89587cd6a 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
@@ -107,7 +107,7 @@ static struct pci_driver ixgb_driver = {
107 107
108MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>"); 108MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
109MODULE_DESCRIPTION("Intel(R) PRO/10GbE Network Driver"); 109MODULE_DESCRIPTION("Intel(R) PRO/10GbE Network Driver");
110MODULE_LICENSE("GPL"); 110MODULE_LICENSE("GPL v2");
111MODULE_VERSION(DRV_VERSION); 111MODULE_VERSION(DRV_VERSION);
112 112
113#define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV|NETIF_MSG_PROBE|NETIF_MSG_LINK) 113#define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV|NETIF_MSG_PROBE|NETIF_MSG_LINK)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 604282f03d23..27a8546c88b2 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -159,7 +159,7 @@ MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
159 159
160MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>"); 160MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
161MODULE_DESCRIPTION("Intel(R) 10 Gigabit PCI Express Network Driver"); 161MODULE_DESCRIPTION("Intel(R) 10 Gigabit PCI Express Network Driver");
162MODULE_LICENSE("GPL"); 162MODULE_LICENSE("GPL v2");
163MODULE_VERSION(DRV_VERSION); 163MODULE_VERSION(DRV_VERSION);
164 164
165static struct workqueue_struct *ixgbe_wq; 165static struct workqueue_struct *ixgbe_wq;
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 17e23f609d74..ba6562e8cd73 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -79,7 +79,7 @@ MODULE_DEVICE_TABLE(pci, ixgbevf_pci_tbl);
79 79
80MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>"); 80MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
81MODULE_DESCRIPTION("Intel(R) 10 Gigabit Virtual Function Network Driver"); 81MODULE_DESCRIPTION("Intel(R) 10 Gigabit Virtual Function Network Driver");
82MODULE_LICENSE("GPL"); 82MODULE_LICENSE("GPL v2");
83MODULE_VERSION(DRV_VERSION); 83MODULE_VERSION(DRV_VERSION);
84 84
85#define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV|NETIF_MSG_PROBE|NETIF_MSG_LINK) 85#define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV|NETIF_MSG_PROBE|NETIF_MSG_LINK)