drop queue-5.15/iwlwifi-remove-contact-information.patch

diff --git a/queue-5.15/iwlwifi-remove-contact-information.patch b/queue-5.15/iwlwifi-remove-contact-information.patch
deleted file mode 100644 (file)
index 58fa33d..0000000
--- a/queue-5.15/iwlwifi-remove-contact-information.patch
+++ /dev/null
@@ -1,613 +0,0 @@
-From 03f60855381d9fc05d24e477a589cfa386d00da9 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 17 Oct 2021 11:43:48 +0300
-Subject: iwlwifi: remove contact information
-
-From: Johannes Berg <johannes.berg@intel.com>
-
-[ Upstream commit 854fe828e58ceafbab92d408ad344a168ea41555 ]
-
-The list address is going away, and the postal address isn't
-useful, remove all the contact information.
-
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
-Link: https://lore.kernel.org/r/iwlwifi.20211017113927.f73e3b6384cb.I967fd394995461277eafa149bb25cefd1673751e@changeid
-Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
-Stable-dep-of: 658939fc68d3 ("wifi: iwlwifi: empty overflow queue during flush")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/wireless/intel/iwlwifi/cfg/1000.c             | 5 -----
- drivers/net/wireless/intel/iwlwifi/cfg/2000.c             | 5 -----
- drivers/net/wireless/intel/iwlwifi/cfg/5000.c             | 5 -----
- drivers/net/wireless/intel/iwlwifi/cfg/6000.c             | 5 -----
- drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c          | 4 ----
- drivers/net/wireless/intel/iwlwifi/dvm/dev.h              | 5 -----
- drivers/net/wireless/intel/iwlwifi/dvm/devices.c          | 5 -----
- drivers/net/wireless/intel/iwlwifi/dvm/led.c              | 5 -----
- drivers/net/wireless/intel/iwlwifi/dvm/led.h              | 5 -----
- drivers/net/wireless/intel/iwlwifi/dvm/lib.c              | 5 -----
- drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c         | 5 -----
- drivers/net/wireless/intel/iwlwifi/dvm/main.c             | 5 -----
- drivers/net/wireless/intel/iwlwifi/dvm/power.c            | 4 ----
- drivers/net/wireless/intel/iwlwifi/dvm/power.h            | 4 ----
- drivers/net/wireless/intel/iwlwifi/dvm/rs.c               | 5 -----
- drivers/net/wireless/intel/iwlwifi/dvm/rs.h               | 5 -----
- drivers/net/wireless/intel/iwlwifi/dvm/rx.c               | 5 -----
- drivers/net/wireless/intel/iwlwifi/dvm/rxon.c             | 5 -----
- drivers/net/wireless/intel/iwlwifi/dvm/scan.c             | 4 ----
- drivers/net/wireless/intel/iwlwifi/dvm/sta.c              | 5 -----
- drivers/net/wireless/intel/iwlwifi/dvm/tt.c               | 4 ----
- drivers/net/wireless/intel/iwlwifi/dvm/tt.h               | 4 ----
- drivers/net/wireless/intel/iwlwifi/dvm/tx.c               | 5 -----
- drivers/net/wireless/intel/iwlwifi/dvm/ucode.c            | 5 -----
- drivers/net/wireless/intel/iwlwifi/fw/img.c               | 5 -----
- drivers/net/wireless/intel/iwlwifi/iwl-debug.h            | 5 -----
- drivers/net/wireless/intel/iwlwifi/iwl-devtrace-data.h    | 5 -----
- drivers/net/wireless/intel/iwlwifi/iwl-devtrace-io.h      | 5 -----
- drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h | 5 -----
- drivers/net/wireless/intel/iwlwifi/iwl-devtrace-msg.h     | 5 -----
- drivers/net/wireless/intel/iwlwifi/iwl-devtrace-ucode.h   | 5 -----
- drivers/net/wireless/intel/iwlwifi/iwl-devtrace.c         | 5 -----
- drivers/net/wireless/intel/iwlwifi/iwl-devtrace.h         | 5 -----
- drivers/net/wireless/intel/iwlwifi/mvm/rs.c               | 5 -----
- drivers/net/wireless/intel/iwlwifi/mvm/rs.h               | 5 -----
- 35 files changed, 169 deletions(-)
-
-diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/1000.c b/drivers/net/wireless/intel/iwlwifi/cfg/1000.c
-index 44c4fe9753901..116defb15afbd 100644
---- a/drivers/net/wireless/intel/iwlwifi/cfg/1000.c
-+++ b/drivers/net/wireless/intel/iwlwifi/cfg/1000.c
-@@ -3,11 +3,6 @@
-  *
-  * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
-  * Copyright(c) 2018 - 2020 Intel Corporation
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-- *
-  *****************************************************************************/
- 
- #include <linux/module.h>
-diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/2000.c b/drivers/net/wireless/intel/iwlwifi/cfg/2000.c
-index df6ac00340b26..ab2038a3fbe21 100644
---- a/drivers/net/wireless/intel/iwlwifi/cfg/2000.c
-+++ b/drivers/net/wireless/intel/iwlwifi/cfg/2000.c
-@@ -3,11 +3,6 @@
-  *
-  * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
-  * Copyright(c) 2018 - 2020 Intel Corporation
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-- *
-  *****************************************************************************/
- 
- #include <linux/module.h>
-diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/5000.c b/drivers/net/wireless/intel/iwlwifi/cfg/5000.c
-index 6cdd7d983bdae..e2e23d2bc1fe5 100644
---- a/drivers/net/wireless/intel/iwlwifi/cfg/5000.c
-+++ b/drivers/net/wireless/intel/iwlwifi/cfg/5000.c
-@@ -3,11 +3,6 @@
-  *
-  * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
-  * Copyright(c) 2018 - 2020 Intel Corporation
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-- *
-  *****************************************************************************/
- 
- #include <linux/module.h>
-diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/6000.c b/drivers/net/wireless/intel/iwlwifi/cfg/6000.c
-index 541a3ec857770..20929e59c2f4d 100644
---- a/drivers/net/wireless/intel/iwlwifi/cfg/6000.c
-+++ b/drivers/net/wireless/intel/iwlwifi/cfg/6000.c
-@@ -3,11 +3,6 @@
-  *
-  * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
-  * Copyright(c) 2018 - 2020 Intel Corporation
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-- *
-  *****************************************************************************/
- 
- #include <linux/module.h>
-diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c
-index 9110492018387..b246dbd371b35 100644
---- a/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c
-+++ b/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c
-@@ -3,10 +3,6 @@
-  *
-  * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
-  * Copyright (C) 2018 Intel Corporation
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-  *****************************************************************************/
- 
- #include <linux/slab.h>
-diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/dev.h b/drivers/net/wireless/intel/iwlwifi/dvm/dev.h
-index 4bd792c06ff6e..bbd5740912012 100644
---- a/drivers/net/wireless/intel/iwlwifi/dvm/dev.h
-+++ b/drivers/net/wireless/intel/iwlwifi/dvm/dev.h
-@@ -2,11 +2,6 @@
- /******************************************************************************
-  *
-  * Copyright(c) 2003 - 2014, 2020 Intel Corporation. All rights reserved.
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-- *
-  *****************************************************************************/
- /*
-  * Please use this file (dev.h) for driver implementation definitions.
-diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/devices.c b/drivers/net/wireless/intel/iwlwifi/dvm/devices.c
-index c3e25885d1943..39e40901fa464 100644
---- a/drivers/net/wireless/intel/iwlwifi/dvm/devices.c
-+++ b/drivers/net/wireless/intel/iwlwifi/dvm/devices.c
-@@ -3,11 +3,6 @@
-  *
-  * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
-  * Copyright (C) 2019 Intel Corporation
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-- *
-  *****************************************************************************/
- 
- #include <linux/units.h>
-diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/led.c b/drivers/net/wireless/intel/iwlwifi/dvm/led.c
-index e8a4d604b9106..71f67a019cf60 100644
---- a/drivers/net/wireless/intel/iwlwifi/dvm/led.c
-+++ b/drivers/net/wireless/intel/iwlwifi/dvm/led.c
-@@ -3,11 +3,6 @@
-  *
-  * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.
-  * Copyright (C) 2019 Intel Corporation
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-- *
-  *****************************************************************************/
- 
- 
-diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/led.h b/drivers/net/wireless/intel/iwlwifi/dvm/led.h
-index 6fe20180dc87c..5038fc378a1f7 100644
---- a/drivers/net/wireless/intel/iwlwifi/dvm/led.h
-+++ b/drivers/net/wireless/intel/iwlwifi/dvm/led.h
-@@ -2,11 +2,6 @@
- /******************************************************************************
-  *
-  * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-- *
-  *****************************************************************************/
- 
- #ifndef __iwl_leds_h__
-diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/lib.c b/drivers/net/wireless/intel/iwlwifi/dvm/lib.c
-index 3b937a7dd4032..40d790b36d85b 100644
---- a/drivers/net/wireless/intel/iwlwifi/dvm/lib.c
-+++ b/drivers/net/wireless/intel/iwlwifi/dvm/lib.c
-@@ -2,11 +2,6 @@
- /******************************************************************************
-  *
-  * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-- *
-  *****************************************************************************/
- #include <linux/etherdevice.h>
- #include <linux/kernel.h>
-diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c
-index 90fe4adca4926..e8bd4f0e3d2dc 100644
---- a/drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c
-+++ b/drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c
-@@ -6,11 +6,6 @@
-  *
-  * Portions of this file are derived from the ipw3945 project, as well
-  * as portions of the ieee80211 subsystem header files.
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-- *
-  *****************************************************************************/
- #include <linux/kernel.h>
- #include <linux/module.h>
-diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/main.c b/drivers/net/wireless/intel/iwlwifi/dvm/main.c
-index cc7b69fd14d37..353f660a84928 100644
---- a/drivers/net/wireless/intel/iwlwifi/dvm/main.c
-+++ b/drivers/net/wireless/intel/iwlwifi/dvm/main.c
-@@ -6,11 +6,6 @@
-  *
-  * Portions of this file are derived from the ipw3945 project, as well
-  * as portions of the ieee80211 subsystem header files.
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-- *
-  *****************************************************************************/
- 
- #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/power.c b/drivers/net/wireless/intel/iwlwifi/dvm/power.c
-index 93ef023905c96..6d16a7105656c 100644
---- a/drivers/net/wireless/intel/iwlwifi/dvm/power.c
-+++ b/drivers/net/wireless/intel/iwlwifi/dvm/power.c
-@@ -6,10 +6,6 @@
-  *
-  * Portions of this file are derived from the ipw3945 project, as well
-  * as portions of the ieee80211 subsystem header files.
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-  *****************************************************************************/
- 
- 
-diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/power.h b/drivers/net/wireless/intel/iwlwifi/dvm/power.h
-index 3f8db1fc4b590..f38201ce1e991 100644
---- a/drivers/net/wireless/intel/iwlwifi/dvm/power.h
-+++ b/drivers/net/wireless/intel/iwlwifi/dvm/power.h
-@@ -5,10 +5,6 @@
-  *
-  * Portions of this file are derived from the ipw3945 project, as well
-  * as portions of the ieee80211 subsystem header files.
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-  *****************************************************************************/
- #ifndef __iwl_power_setting_h__
- #define __iwl_power_setting_h__
-diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/rs.c b/drivers/net/wireless/intel/iwlwifi/dvm/rs.c
-index 548540dd0c0f7..b7c8b209bfea4 100644
---- a/drivers/net/wireless/intel/iwlwifi/dvm/rs.c
-+++ b/drivers/net/wireless/intel/iwlwifi/dvm/rs.c
-@@ -3,11 +3,6 @@
-  *
-  * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
-  * Copyright (C) 2019 - 2020 Intel Corporation
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-- *
-  *****************************************************************************/
- #include <linux/kernel.h>
- #include <linux/skbuff.h>
-diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/rs.h b/drivers/net/wireless/intel/iwlwifi/dvm/rs.h
-index 68a840d739e83..0b47f1993c5db 100644
---- a/drivers/net/wireless/intel/iwlwifi/dvm/rs.h
-+++ b/drivers/net/wireless/intel/iwlwifi/dvm/rs.h
-@@ -2,11 +2,6 @@
- /******************************************************************************
-  *
-  * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-- *
-  *****************************************************************************/
- 
- #ifndef __iwl_agn_rs_h__
-diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/rx.c b/drivers/net/wireless/intel/iwlwifi/dvm/rx.c
-index 3cd7b423c588d..db0c41bbeb0e1 100644
---- a/drivers/net/wireless/intel/iwlwifi/dvm/rx.c
-+++ b/drivers/net/wireless/intel/iwlwifi/dvm/rx.c
-@@ -7,11 +7,6 @@
-  *
-  * Portions of this file are derived from the ipw3945 project, as well
-  * as portionhelp of the ieee80211 subsystem header files.
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-- *
-  *****************************************************************************/
- 
- #include <linux/etherdevice.h>
-diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/rxon.c b/drivers/net/wireless/intel/iwlwifi/dvm/rxon.c
-index 12a3d464ae640..70338bc7bb540 100644
---- a/drivers/net/wireless/intel/iwlwifi/dvm/rxon.c
-+++ b/drivers/net/wireless/intel/iwlwifi/dvm/rxon.c
-@@ -3,11 +3,6 @@
-  *
-  * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.
-  * Copyright(c) 2015 Intel Deutschland GmbH
-- *
-- * Contact Information:
-- * Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-- *
-  *****************************************************************************/
- 
- #include <linux/etherdevice.h>
-diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/scan.c b/drivers/net/wireless/intel/iwlwifi/dvm/scan.c
-index c4ecf6ed21860..2d38227dfdd20 100644
---- a/drivers/net/wireless/intel/iwlwifi/dvm/scan.c
-+++ b/drivers/net/wireless/intel/iwlwifi/dvm/scan.c
-@@ -3,10 +3,6 @@
-  *
-  * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
-  * Copyright(c) 2018        Intel Corporation
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-  *****************************************************************************/
- #include <linux/slab.h>
- #include <linux/types.h>
-diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/sta.c b/drivers/net/wireless/intel/iwlwifi/dvm/sta.c
-index 7c3168145e58a..03ceb0615368b 100644
---- a/drivers/net/wireless/intel/iwlwifi/dvm/sta.c
-+++ b/drivers/net/wireless/intel/iwlwifi/dvm/sta.c
-@@ -5,11 +5,6 @@
-  *
-  * Portions of this file are derived from the ipw3945 project, as well
-  * as portions of the ieee80211 subsystem header files.
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-- *
-  *****************************************************************************/
- #include <linux/etherdevice.h>
- #include <net/mac80211.h>
-diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/tt.c b/drivers/net/wireless/intel/iwlwifi/dvm/tt.c
-index 2684a924ba574..43e8d04d5a8b2 100644
---- a/drivers/net/wireless/intel/iwlwifi/dvm/tt.c
-+++ b/drivers/net/wireless/intel/iwlwifi/dvm/tt.c
-@@ -6,10 +6,6 @@
-  *
-  * Portions of this file are derived from the ipw3945 project, as well
-  * as portions of the ieee80211 subsystem header files.
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-  *****************************************************************************/
- 
- 
-diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/tt.h b/drivers/net/wireless/intel/iwlwifi/dvm/tt.h
-index 3b0ff458a158b..7ace052fc78a4 100644
---- a/drivers/net/wireless/intel/iwlwifi/dvm/tt.h
-+++ b/drivers/net/wireless/intel/iwlwifi/dvm/tt.h
-@@ -5,10 +5,6 @@
-  *
-  * Portions of this file are derived from the ipw3945 project, as well
-  * as portions of the ieee80211 subsystem header files.
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-  *****************************************************************************/
- #ifndef __iwl_tt_setting_h__
- #define __iwl_tt_setting_h__
-diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/tx.c b/drivers/net/wireless/intel/iwlwifi/dvm/tx.c
-index 847b8e07f81c5..60a7b61d59aa3 100644
---- a/drivers/net/wireless/intel/iwlwifi/dvm/tx.c
-+++ b/drivers/net/wireless/intel/iwlwifi/dvm/tx.c
-@@ -3,11 +3,6 @@
-  *
-  * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
-  * Copyright (C) 2019 Intel Corporation
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-- *
-  *****************************************************************************/
- 
- #include <linux/kernel.h>
-diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/ucode.c b/drivers/net/wireless/intel/iwlwifi/dvm/ucode.c
-index 24194c7912181..4b27a53d0bb4a 100644
---- a/drivers/net/wireless/intel/iwlwifi/dvm/ucode.c
-+++ b/drivers/net/wireless/intel/iwlwifi/dvm/ucode.c
-@@ -3,11 +3,6 @@
-  *
-  * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
-  * Copyright(c) 2015 Intel Deutschland GmbH
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-- *
-  *****************************************************************************/
- 
- #include <linux/kernel.h>
-diff --git a/drivers/net/wireless/intel/iwlwifi/fw/img.c b/drivers/net/wireless/intel/iwlwifi/fw/img.c
-index c2a4e60518bc7..5755e179066ae 100644
---- a/drivers/net/wireless/intel/iwlwifi/fw/img.c
-+++ b/drivers/net/wireless/intel/iwlwifi/fw/img.c
-@@ -18,11 +18,6 @@
-  *
-  * The full GNU General Public License is included in this distribution
-  * in the file called COPYING.
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-- *
-  * BSD LICENSE
-  *
-  * Copyright(c) 2019 - 2020 Intel Corporation
-diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-debug.h b/drivers/net/wireless/intel/iwlwifi/iwl-debug.h
-index 528eba441926d..8db7aeddfd057 100644
---- a/drivers/net/wireless/intel/iwlwifi/iwl-debug.h
-+++ b/drivers/net/wireless/intel/iwlwifi/iwl-debug.h
-@@ -5,11 +5,6 @@
-  * Copyright(c) 2018 - 2020 Intel Corporation
-  *
-  * Portions of this file are derived from the ipw3945 project.
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-- *
-  *****************************************************************************/
- 
- #ifndef __iwl_debug_h__
-diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-data.h b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-data.h
-index 1bc6ecc321404..347fd95c4e3a5 100644
---- a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-data.h
-+++ b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-data.h
-@@ -4,11 +4,6 @@
-  * Copyright(c) 2009 - 2014 Intel Corporation. All rights reserved.
-  * Copyright(c) 2015        Intel Deutschland GmbH
-  * Copyright(c) 2018 - 2019 Intel Corporation
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-- *
-  *****************************************************************************/
- 
- #if !defined(__IWLWIFI_DEVICE_TRACE_DATA) || defined(TRACE_HEADER_MULTI_READ)
-diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-io.h b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-io.h
-index a57019241a780..0af9d8362c5b8 100644
---- a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-io.h
-+++ b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-io.h
-@@ -3,11 +3,6 @@
-  *
-  * Copyright(c) 2009 - 2014 Intel Corporation. All rights reserved.
-  * Copyright(c) 2016-2017 Intel Deutschland GmbH
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-- *
-  *****************************************************************************/
- 
- #if !defined(__IWLWIFI_DEVICE_TRACE_IO) || defined(TRACE_HEADER_MULTI_READ)
-diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h
-index 72ca882daed5e..46ed723f138a6 100644
---- a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h
-+++ b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h
-@@ -5,11 +5,6 @@
-  * Copyright(c) 2015 Intel Mobile Communications GmbH
-  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
-  * Copyright(c) 2018        Intel Corporation
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-- *
-  *****************************************************************************/
- 
- #if !defined(__IWLWIFI_DEVICE_TRACE_IWLWIFI) || defined(TRACE_HEADER_MULTI_READ)
-diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-msg.h b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-msg.h
-index d0467da5af034..7dd70011fd1ef 100644
---- a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-msg.h
-+++ b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-msg.h
-@@ -2,11 +2,6 @@
- /******************************************************************************
-  *
-  * Copyright(c) 2009 - 2014 Intel Corporation. All rights reserved.
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-- *
-  *****************************************************************************/
- 
- #if !defined(__IWLWIFI_DEVICE_TRACE_MSG) || defined(TRACE_HEADER_MULTI_READ)
-diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-ucode.h b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-ucode.h
-index 2228faefffbca..3ec0205ac9f90 100644
---- a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-ucode.h
-+++ b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-ucode.h
-@@ -2,11 +2,6 @@
- /******************************************************************************
-  *
-  * Copyright(c) 2009 - 2014 Intel Corporation. All rights reserved.
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-- *
-  *****************************************************************************/
- 
- #if !defined(__IWLWIFI_DEVICE_TRACE_UCODE) || defined(TRACE_HEADER_MULTI_READ)
-diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace.c b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace.c
-index b5037db0c3817..999b7c652289d 100644
---- a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace.c
-+++ b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace.c
-@@ -3,11 +3,6 @@
-  *
-  * Copyright(c) 2009 - 2014 Intel Corporation. All rights reserved.
-  * Copyright (C) 2018 Intel Corporation
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-- *
-  *****************************************************************************/
- 
- #include <linux/module.h>
-diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace.h b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace.h
-index fc8bc212ee847..1455b578358bf 100644
---- a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace.h
-+++ b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace.h
-@@ -4,11 +4,6 @@
-  * Copyright(c) 2009 - 2014 Intel Corporation. All rights reserved.
-  * Copyright(C) 2016        Intel Deutschland GmbH
-  * Copyright(c) 2018        Intel Corporation
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-- *
-  *****************************************************************************/
- 
- #ifndef __IWLWIFI_DEVICE_TRACE
-diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rs.c b/drivers/net/wireless/intel/iwlwifi/mvm/rs.c
-index b97708cb869d5..c66aa61b4ba31 100644
---- a/drivers/net/wireless/intel/iwlwifi/mvm/rs.c
-+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rs.c
-@@ -4,11 +4,6 @@
-  * Copyright(c) 2005 - 2014, 2018 - 2021 Intel Corporation. All rights reserved.
-  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
-  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-- *
-  *****************************************************************************/
- #include <linux/kernel.h>
- #include <linux/skbuff.h>
-diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rs.h b/drivers/net/wireless/intel/iwlwifi/mvm/rs.h
-index 32104c9f8f5ee..3e206df57347c 100644
---- a/drivers/net/wireless/intel/iwlwifi/mvm/rs.h
-+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rs.h
-@@ -5,11 +5,6 @@
-  * Copyright(c) 2015 Intel Mobile Communications GmbH
-  * Copyright(c) 2017 Intel Deutschland GmbH
-  * Copyright(c) 2018 - 2019 Intel Corporation
-- *
-- * Contact Information:
-- *  Intel Linux Wireless <linuxwifi@intel.com>
-- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-- *
-  *****************************************************************************/
- 
- #ifndef __rs_h__
--- 
-2.42.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 6812a8e91e223e8c7c722ed0a5ae101a6eda2dad..973a6a4064ef0f56cd6ec7f17ed88e6e268e12f8 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -43,7 +43,6 @@ tcp-fix-cookie_init_timestamp-overflows.patch
 iwlwifi-pcie-adjust-to-bz-completion-descriptor.patch
 wifi-iwlwifi-call-napi_synchronize-before-freeing-rx.patch
 wifi-iwlwifi-pcie-synchronize-irqs-before-napi.patch
-iwlwifi-remove-contact-information.patch
 wifi-iwlwifi-empty-overflow-queue-during-flush.patch
 acpi-sysfs-fix-create_pnp_modalias-and-create_of_mod.patch
 ipv6-avoid-atomic-fragment-on-gso-packets.patch

diff --git a/queue-5.15/wifi-iwlwifi-empty-overflow-queue-during-flush.patch b/queue-5.15/wifi-iwlwifi-empty-overflow-queue-during-flush.patch
index d53a9067523e997646ac9b234fdf9959bea2ddfd..59b2ac208b291e0d72a0562591a650958058ea3c 100644 (file)
--- a/queue-5.15/wifi-iwlwifi-empty-overflow-queue-during-flush.patch
+++ b/queue-5.15/wifi-iwlwifi-empty-overflow-queue-during-flush.patch
@@ -25,15 +25,13 @@ Link: https://lore.kernel.org/r/20231022173519.caf06c8709d9.Ibf664ccb3f952e836f8
 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/net/wireless/intel/iwlwifi/dvm/tx.c    | 5 +++--
- drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 7 ++++---
- drivers/net/wireless/intel/iwlwifi/mvm/tx.c    | 4 ++--
- drivers/net/wireless/intel/iwlwifi/queue/tx.c  | 9 +++++----
- drivers/net/wireless/intel/iwlwifi/queue/tx.h  | 2 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/tx.c    |    5 +++--
+ drivers/net/wireless/intel/iwlwifi/iwl-trans.h |    7 ++++---
+ drivers/net/wireless/intel/iwlwifi/mvm/tx.c    |    4 ++--
+ drivers/net/wireless/intel/iwlwifi/queue/tx.c  |    9 +++++----
+ drivers/net/wireless/intel/iwlwifi/queue/tx.h  |    2 +-
  5 files changed, 15 insertions(+), 12 deletions(-)
 
-diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/tx.c b/drivers/net/wireless/intel/iwlwifi/dvm/tx.c
-index 60a7b61d59aa3..ca1daec641c4f 100644
 --- a/drivers/net/wireless/intel/iwlwifi/dvm/tx.c
 +++ b/drivers/net/wireless/intel/iwlwifi/dvm/tx.c
 @@ -3,6 +3,7 @@
@@ -41,10 +39,10 @@ index 60a7b61d59aa3..ca1daec641c4f 100644
   * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
   * Copyright (C) 2019 Intel Corporation
 + * Copyright (C) 2023 Intel Corporation
-  *****************************************************************************/
- 
- #include <linux/kernel.h>
-@@ -1169,7 +1170,7 @@ void iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb)
+  *
+  * Contact Information:
+  *  Intel Linux Wireless <linuxwifi@intel.com>
+@@ -1174,7 +1175,7 @@ void iwlagn_rx_reply_tx(struct iwl_priv
                        iwlagn_check_ratid_empty(priv, sta_id, tid);
                }
  
@@ -53,7 +51,7 @@ index 60a7b61d59aa3..ca1daec641c4f 100644
  
                freed = 0;
  
-@@ -1315,7 +1316,7 @@ void iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,
+@@ -1320,7 +1321,7 @@ void iwlagn_rx_reply_compressed_ba(struc
         * block-ack window (we assume that they've been successfully
         * transmitted ... if not, it's too late anyway). */
        iwl_trans_reclaim(priv->trans, scd_flow, ba_resp_scd_ssn,
@@ -62,8 +60,6 @@ index 60a7b61d59aa3..ca1daec641c4f 100644
  
        IWL_DEBUG_TX_REPLY(priv, "REPLY_COMPRESSED_BA [%d] Received from %pM, "
                           "sta_id = %d\n",
-diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
-index 8f0ff540f4398..a2919a32d7081 100644
 --- a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
 +++ b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
 @@ -539,7 +539,7 @@ struct iwl_trans_ops {
@@ -75,7 +71,7 @@ index 8f0ff540f4398..a2919a32d7081 100644
  
        void (*set_q_ptrs)(struct iwl_trans *trans, int queue, int ptr);
  
-@@ -1122,14 +1122,15 @@ static inline int iwl_trans_tx(struct iwl_trans *trans, struct sk_buff *skb,
+@@ -1122,14 +1122,15 @@ static inline int iwl_trans_tx(struct iw
  }
  
  static inline void iwl_trans_reclaim(struct iwl_trans *trans, int queue,
@@ -93,11 +89,9 @@ index 8f0ff540f4398..a2919a32d7081 100644
  }
  
  static inline void iwl_trans_set_q_ptrs(struct iwl_trans *trans, int queue,
-diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
-index 5304edd351db2..08dd227bad4b1 100644
 --- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
 +++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
-@@ -1436,7 +1436,7 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm,
+@@ -1436,7 +1436,7 @@ static void iwl_mvm_rx_tx_cmd_single(str
        seq_ctl = le16_to_cpu(tx_resp->seq_ctl);
  
        /* we can free until ssn % q.n_bd not inclusive */
@@ -106,7 +100,7 @@ index 5304edd351db2..08dd227bad4b1 100644
  
        while (!skb_queue_empty(&skbs)) {
                struct sk_buff *skb = __skb_dequeue(&skbs);
-@@ -1781,7 +1781,7 @@ static void iwl_mvm_tx_reclaim(struct iwl_mvm *mvm, int sta_id, int tid,
+@@ -1781,7 +1781,7 @@ static void iwl_mvm_tx_reclaim(struct iw
         * block-ack window (we assume that they've been successfully
         * transmitted ... if not, it's too late anyway).
         */
@@ -115,11 +109,9 @@ index 5304edd351db2..08dd227bad4b1 100644
  
        skb_queue_walk(&reclaimed_skbs, skb) {
                struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
-diff --git a/drivers/net/wireless/intel/iwlwifi/queue/tx.c b/drivers/net/wireless/intel/iwlwifi/queue/tx.c
-index 8522cdfc9e5d3..cd852b95d8125 100644
 --- a/drivers/net/wireless/intel/iwlwifi/queue/tx.c
 +++ b/drivers/net/wireless/intel/iwlwifi/queue/tx.c
-@@ -1520,7 +1520,7 @@ void iwl_txq_progress(struct iwl_txq *txq)
+@@ -1520,7 +1520,7 @@ void iwl_txq_progress(struct iwl_txq *tx
  
  /* Frees buffers until index _not_ inclusive */
  void iwl_txq_reclaim(struct iwl_trans *trans, int txq_id, int ssn,
@@ -128,7 +120,7 @@ index 8522cdfc9e5d3..cd852b95d8125 100644
  {
        struct iwl_txq *txq = trans->txqs.txq[txq_id];
        int tfd_num = iwl_txq_get_cmd_index(txq, ssn);
-@@ -1591,9 +1591,11 @@ void iwl_txq_reclaim(struct iwl_trans *trans, int txq_id, int ssn,
+@@ -1591,9 +1591,11 @@ void iwl_txq_reclaim(struct iwl_trans *t
        if (iwl_txq_space(trans, txq) > txq->low_mark &&
            test_bit(txq_id, trans->txqs.queue_stopped)) {
                struct sk_buff_head overflow_skbs;
@@ -141,7 +133,7 @@ index 8522cdfc9e5d3..cd852b95d8125 100644
  
                /*
                 * We are going to transmit from the overflow queue.
-@@ -1613,8 +1615,7 @@ void iwl_txq_reclaim(struct iwl_trans *trans, int txq_id, int ssn,
+@@ -1613,8 +1615,7 @@ void iwl_txq_reclaim(struct iwl_trans *t
                 */
                spin_unlock_bh(&txq->lock);
  
@@ -151,11 +143,9 @@ index 8522cdfc9e5d3..cd852b95d8125 100644
                        struct iwl_device_tx_cmd *dev_cmd_ptr;
  
                        dev_cmd_ptr = *(void **)((u8 *)skb->cb +
-diff --git a/drivers/net/wireless/intel/iwlwifi/queue/tx.h b/drivers/net/wireless/intel/iwlwifi/queue/tx.h
-index 19178c88bb229..f488fc9f6b83e 100644
 --- a/drivers/net/wireless/intel/iwlwifi/queue/tx.h
 +++ b/drivers/net/wireless/intel/iwlwifi/queue/tx.h
-@@ -174,7 +174,7 @@ void iwl_txq_gen1_update_byte_cnt_tbl(struct iwl_trans *trans,
+@@ -174,7 +174,7 @@ void iwl_txq_gen1_update_byte_cnt_tbl(st
                                      struct iwl_txq *txq, u16 byte_cnt,
                                      int num_tbs);
  void iwl_txq_reclaim(struct iwl_trans *trans, int txq_id, int ssn,
@@ -164,6 +154,3 @@ index 19178c88bb229..f488fc9f6b83e 100644
  void iwl_txq_set_q_ptrs(struct iwl_trans *trans, int txq_id, int ptr);
  void iwl_trans_txq_freeze_timer(struct iwl_trans *trans, unsigned long txqs,
                                bool freeze);
--- 
-2.42.0
-