Re: [PATCH 07/10] iwlwifi: remove support for fw older than -17 and -22

[Coelho, Luciano]

On Thu, 2016-09-22 at 23:52 +0300, Luca Coelho wrote:
> From: Luca Coelho 
> 
> FW versions older than -17 for 3160 and 7260 and older than -22 for
> newer NICs are not supported anymore.  Don't load these versions
> and remove code that handles them.
> 
> Signed-off-by: Luca Coelho 
> Signed-off-by: Luca Coelho 
> ---

Heh, double S-O-B.  I'll fix this before sending the pull request.

--
Luca.

[PATCH 07/10] iwlwifi: remove support for fw older than -17 and -22

[Luca Coelho]

From: Luca Coelho 

FW versions older than -17 for 3160 and 7260 and older than -22 for
newer NICs are not supported anymore.  Don't load these versions
and remove code that handles them.

Signed-off-by: Luca Coelho 
Signed-off-by: Luca Coelho 
---
 drivers/net/wireless/intel/iwlwifi/iwl-7000.c  |  6 ++---
 drivers/net/wireless/intel/iwlwifi/iwl-8000.c  |  2 +-
 drivers/net/wireless/intel/iwlwifi/iwl-9000.c  |  2 +-
 drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h   | 24 +--
 .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c   |  3 +--
 .../net/wireless/intel/iwlwifi/mvm/fw-api-power.h  | 21 +
 drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tx.h |  2 --
 drivers/net/wireless/intel/iwlwifi/mvm/fw.c| 10 +---
 drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c  | 24 ---
 drivers/net/wireless/intel/iwlwifi/mvm/mvm.h   |  2 --
 drivers/net/wireless/intel/iwlwifi/mvm/ops.c   |  6 ++---
 drivers/net/wireless/intel/iwlwifi/mvm/power.c | 15 
 drivers/net/wireless/intel/iwlwifi/mvm/scan.c  | 27 --
 drivers/net/wireless/intel/iwlwifi/mvm/tt.c| 10 ++--
 14 files changed, 36 insertions(+), 118 deletions(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-7000.c 
b/drivers/net/wireless/intel/iwlwifi/iwl-7000.c
index aa575fb..d4b73de 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-7000.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-7000.c
@@ -77,9 +77,9 @@
 #define IWL3168_UCODE_API_MAX  26
 
 /* Lowest firmware API version supported */
-#define IWL7260_UCODE_API_MIN  16
-#define IWL7265_UCODE_API_MIN  16
-#define IWL7265D_UCODE_API_MIN 16
+#define IWL7260_UCODE_API_MIN  17
+#define IWL7265_UCODE_API_MIN  17
+#define IWL7265D_UCODE_API_MIN 17
 #define IWL3168_UCODE_API_MIN  20
 
 /* NVM versions */
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c 
b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
index 990cf2b..d02ca14 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
@@ -74,7 +74,7 @@
 #define IWL8265_UCODE_API_MAX  26
 
 /* Lowest firmware API version supported */
-#define IWL8000_UCODE_API_MIN  16
+#define IWL8000_UCODE_API_MIN  17
 #define IWL8265_UCODE_API_MIN  20
 
 /* NVM versions */
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-9000.c 
b/drivers/net/wireless/intel/iwlwifi/iwl-9000.c
index a2c7946..ff85041 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-9000.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-9000.c
@@ -58,7 +58,7 @@
 #define IWL9000_UCODE_API_MAX  26
 
 /* Lowest firmware API version supported */
-#define IWL9000_UCODE_API_MIN  16
+#define IWL9000_UCODE_API_MIN  17
 
 /* NVM versions */
 #define IWL9000_NVM_VERSION0x0a1d
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h 
b/drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h
index 94423f0..ceec5ca 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h
@@ -199,8 +199,6 @@ struct iwl_ucode_capa {
  * @IWL_UCODE_TLV_FLAGS_NEWSCAN: new uCode scan behavior on hidden SSID,
  * treats good CRC threshold as a boolean
  * @IWL_UCODE_TLV_FLAGS_MFP: This uCode image supports MFP (802.11w).
- * @IWL_UCODE_TLV_FLAGS_P2P: This uCode image supports P2P.
- * @IWL_UCODE_TLV_FLAGS_DW_BC_TABLE: The SCD byte count table is in DWORDS
  * @IWL_UCODE_TLV_FLAGS_UAPSD_SUPPORT: This uCode image supports uAPSD
  * @IWL_UCODE_TLV_FLAGS_SHORT_BL: 16 entries of black list instead of 64 in 
scan
  * offload profile config command.
@@ -210,36 +208,24 @@ struct iwl_ucode_capa {
  * from the probe request template.
  * @IWL_UCODE_TLV_FLAGS_NEW_NSOFFL_SMALL: new NS offload (small version)
  * @IWL_UCODE_TLV_FLAGS_NEW_NSOFFL_LARGE: new NS offload (large version)
- * @IWL_UCODE_TLV_FLAGS_P2P_PM: P2P client supports PM as a stand alone MAC
- * @IWL_UCODE_TLV_FLAGS_P2P_BSS_PS_DCM: support power save on BSS station and
- * P2P client interfaces simultaneously if they are in different bindings.
- * @IWL_UCODE_TLV_FLAGS_P2P_BSS_PS_SCM: support power save on BSS station and
- * P2P client interfaces simultaneously if they are in same bindings.
  * @IWL_UCODE_TLV_FLAGS_UAPSD_SUPPORT: General support for uAPSD
  * @IWL_UCODE_TLV_FLAGS_P2P_PS_UAPSD: P2P client supports uAPSD power save
  * @IWL_UCODE_TLV_FLAGS_BCAST_FILTERING: uCode supports broadcast filtering.
- * @IWL_UCODE_TLV_FLAGS_GO_UAPSD: AP/GO interfaces support uAPSD clients
  * @IWL_UCODE_TLV_FLAGS_EBS_SUPPORT: this uCode image supports EBS.
  */
 enum iwl_ucode_tlv_flag {
IWL_UCODE_TLV_FLAGS_PAN = BIT(0),
IWL_UCODE_TLV_FLAGS_NEWSCAN = BIT(1),
IWL_UCODE_TLV_FLAGS_MFP = BIT(2),
-   IWL_UCODE_TLV_FLAGS_P2P = BIT(3),
-   IWL_UCODE_TLV_FLAGS_DW_BC_TABLE