浏览代码

iwlwifi: a few fixes in license

7000.c was released as GPL only by mistake: it should be
dual licensed - GPL / BSD.
The file that contains the license in the kernel is COPYING
and not LICENSE.GPL.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Emmanuel Grumbach 12 年之前
父节点
当前提交
410dc5aa59
共有 69 个文件被更改,包括 117 次插入80 次删除
  1. 1 1
      drivers/net/wireless/iwlwifi/dvm/agn.h
  2. 1 1
      drivers/net/wireless/iwlwifi/dvm/calib.c
  3. 1 1
      drivers/net/wireless/iwlwifi/dvm/calib.h
  4. 1 1
      drivers/net/wireless/iwlwifi/dvm/commands.h
  5. 1 1
      drivers/net/wireless/iwlwifi/dvm/debugfs.c
  6. 1 1
      drivers/net/wireless/iwlwifi/dvm/lib.c
  7. 1 1
      drivers/net/wireless/iwlwifi/dvm/scan.c
  8. 1 1
      drivers/net/wireless/iwlwifi/dvm/testmode.c
  9. 1 1
      drivers/net/wireless/iwlwifi/dvm/tx.c
  10. 1 1
      drivers/net/wireless/iwlwifi/dvm/ucode.c
  11. 1 1
      drivers/net/wireless/iwlwifi/iwl-agn-hw.h
  12. 1 1
      drivers/net/wireless/iwlwifi/iwl-config.h
  13. 1 1
      drivers/net/wireless/iwlwifi/iwl-csr.h
  14. 1 1
      drivers/net/wireless/iwlwifi/iwl-debug.c
  15. 1 1
      drivers/net/wireless/iwlwifi/iwl-drv.c
  16. 1 1
      drivers/net/wireless/iwlwifi/iwl-drv.h
  17. 1 1
      drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
  18. 1 1
      drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h
  19. 1 1
      drivers/net/wireless/iwlwifi/iwl-eeprom-read.c
  20. 1 1
      drivers/net/wireless/iwlwifi/iwl-eeprom-read.h
  21. 1 1
      drivers/net/wireless/iwlwifi/iwl-fh.h
  22. 1 1
      drivers/net/wireless/iwlwifi/iwl-fw-file.h
  23. 1 1
      drivers/net/wireless/iwlwifi/iwl-fw.h
  24. 1 1
      drivers/net/wireless/iwlwifi/iwl-modparams.h
  25. 1 1
      drivers/net/wireless/iwlwifi/iwl-notif-wait.c
  26. 1 1
      drivers/net/wireless/iwlwifi/iwl-notif-wait.h
  27. 1 1
      drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
  28. 1 1
      drivers/net/wireless/iwlwifi/iwl-nvm-parse.h
  29. 1 1
      drivers/net/wireless/iwlwifi/iwl-op-mode.h
  30. 1 1
      drivers/net/wireless/iwlwifi/iwl-phy-db.c
  31. 1 1
      drivers/net/wireless/iwlwifi/iwl-phy-db.h
  32. 1 1
      drivers/net/wireless/iwlwifi/iwl-prph.h
  33. 1 1
      drivers/net/wireless/iwlwifi/iwl-test.c
  34. 1 1
      drivers/net/wireless/iwlwifi/iwl-test.h
  35. 1 1
      drivers/net/wireless/iwlwifi/iwl-testmode.h
  36. 1 1
      drivers/net/wireless/iwlwifi/iwl-trans.h
  37. 1 1
      drivers/net/wireless/iwlwifi/mvm/binding.c
  38. 1 1
      drivers/net/wireless/iwlwifi/mvm/d3.c
  39. 1 1
      drivers/net/wireless/iwlwifi/mvm/debugfs.c
  40. 1 1
      drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h
  41. 1 1
      drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h
  42. 1 1
      drivers/net/wireless/iwlwifi/mvm/fw-api-power.h
  43. 1 1
      drivers/net/wireless/iwlwifi/mvm/fw-api-rs.h
  44. 1 1
      drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h
  45. 1 1
      drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h
  46. 1 1
      drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h
  47. 1 1
      drivers/net/wireless/iwlwifi/mvm/fw-api.h
  48. 1 1
      drivers/net/wireless/iwlwifi/mvm/fw.c
  49. 1 1
      drivers/net/wireless/iwlwifi/mvm/led.c
  50. 1 1
      drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
  51. 1 1
      drivers/net/wireless/iwlwifi/mvm/mac80211.c
  52. 1 1
      drivers/net/wireless/iwlwifi/mvm/mvm.h
  53. 1 1
      drivers/net/wireless/iwlwifi/mvm/nvm.c
  54. 1 1
      drivers/net/wireless/iwlwifi/mvm/ops.c
  55. 1 1
      drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c
  56. 1 1
      drivers/net/wireless/iwlwifi/mvm/power.c
  57. 1 1
      drivers/net/wireless/iwlwifi/mvm/quota.c
  58. 1 1
      drivers/net/wireless/iwlwifi/mvm/rx.c
  59. 1 1
      drivers/net/wireless/iwlwifi/mvm/scan.c
  60. 1 1
      drivers/net/wireless/iwlwifi/mvm/sta.c
  61. 1 1
      drivers/net/wireless/iwlwifi/mvm/sta.h
  62. 1 1
      drivers/net/wireless/iwlwifi/mvm/time-event.c
  63. 1 1
      drivers/net/wireless/iwlwifi/mvm/time-event.h
  64. 1 1
      drivers/net/wireless/iwlwifi/mvm/tx.c
  65. 1 1
      drivers/net/wireless/iwlwifi/mvm/utils.c
  66. 49 12
      drivers/net/wireless/iwlwifi/pcie/7000.c
  67. 1 1
      drivers/net/wireless/iwlwifi/pcie/cfg.h
  68. 1 1
      drivers/net/wireless/iwlwifi/pcie/drv.c
  69. 1 1
      drivers/net/wireless/iwlwifi/pcie/trans.c

+ 1 - 1
drivers/net/wireless/iwlwifi/dvm/agn.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/dvm/calib.c

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/dvm/calib.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/dvm/commands.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/dvm/debugfs.c

@@ -19,7 +19,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/dvm/lib.c

@@ -19,7 +19,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/dvm/scan.c

@@ -19,7 +19,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/dvm/testmode.c

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/dvm/tx.c

@@ -19,7 +19,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/dvm/ucode.c

@@ -19,7 +19,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/iwl-agn-hw.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/iwl-config.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/iwl-csr.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/iwl-debug.c

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/iwl-drv.c

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/iwl-drv.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/iwl-eeprom-read.c

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/iwl-eeprom-read.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/iwl-fh.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/iwl-fw-file.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/iwl-fw.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/iwl-modparams.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/iwl-notif-wait.c

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/iwl-notif-wait.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/iwl-nvm-parse.c

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/iwl-nvm-parse.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/iwl-op-mode.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/iwl-phy-db.c

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/iwl-phy-db.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/iwl-prph.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/iwl-test.c

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/iwl-test.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/iwl-testmode.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/iwl-trans.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/mvm/binding.c

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/mvm/d3.c

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/mvm/debugfs.c

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/mvm/fw-api-power.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/mvm/fw-api-rs.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/mvm/fw-api.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/mvm/fw.c

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/mvm/led.c

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/mvm/mac80211.c

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/mvm/mvm.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/mvm/nvm.c

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/mvm/ops.c

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/mvm/power.c

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/mvm/quota.c

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/mvm/rx.c

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/mvm/scan.c

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/mvm/sta.c

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/mvm/sta.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/mvm/time-event.c

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/mvm/time-event.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/mvm/tx.c

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/mvm/utils.c

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 49 - 12
drivers/net/wireless/iwlwifi/pcie/7000.c

@@ -1,27 +1,64 @@
 /******************************************************************************
  *
- * Copyright(c) 2008 - 2013 Intel Corporation. All rights reserved.
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
  *
- * 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
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ *
+ * 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.
+ * 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.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
+ * USA
  *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
+ * The full GNU General Public License is included in this distribution
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
  * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
  *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2012 - 2013 Intel Corporation. All rights reserved.
+ * 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.
+ *
  *****************************************************************************/
 
 #include <linux/module.h>

+ 1 - 1
drivers/net/wireless/iwlwifi/pcie/cfg.h

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/pcie/drv.c

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>

+ 1 - 1
drivers/net/wireless/iwlwifi/pcie/trans.c

@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>