| From foo@baz Mon Apr 9 17:09:24 CEST 2018 |
| From: Luca Coelho <luciano.coelho@intel.com> |
| Date: Tue, 25 Apr 2017 10:18:10 +0300 |
| Subject: iwlwifi: fix min API version for 7265D, 3168, 8000 and 8265 |
| |
| From: Luca Coelho <luciano.coelho@intel.com> |
| |
| |
| [ Upstream commit 15098803d38778070b8edfa5a3d5fc4fef10d0a1 ] |
| |
| In a previous commit, we removed support for API versions earlier than |
| 22 for these NICs. By mistake, the *_UCODE_API_MIN definitions were |
| set to 17. Fix that. |
| |
| Fixes: 4b87e5af638b ("iwlwifi: remove support for fw older than -17 and -22") |
| Signed-off-by: Luca Coelho <luciano.coelho@intel.com> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/wireless/intel/iwlwifi/iwl-7000.c | 4 ++-- |
| drivers/net/wireless/intel/iwlwifi/iwl-8000.c | 4 ++-- |
| 2 files changed, 4 insertions(+), 4 deletions(-) |
| |
| --- a/drivers/net/wireless/intel/iwlwifi/iwl-7000.c |
| +++ b/drivers/net/wireless/intel/iwlwifi/iwl-7000.c |
| @@ -79,8 +79,8 @@ |
| /* Lowest firmware API version supported */ |
| #define IWL7260_UCODE_API_MIN 17 |
| #define IWL7265_UCODE_API_MIN 17 |
| -#define IWL7265D_UCODE_API_MIN 17 |
| -#define IWL3168_UCODE_API_MIN 20 |
| +#define IWL7265D_UCODE_API_MIN 22 |
| +#define IWL3168_UCODE_API_MIN 22 |
| |
| /* NVM versions */ |
| #define IWL7260_NVM_VERSION 0x0a1d |
| --- a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c |
| +++ b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c |
| @@ -74,8 +74,8 @@ |
| #define IWL8265_UCODE_API_MAX 26 |
| |
| /* Lowest firmware API version supported */ |
| -#define IWL8000_UCODE_API_MIN 17 |
| -#define IWL8265_UCODE_API_MIN 20 |
| +#define IWL8000_UCODE_API_MIN 22 |
| +#define IWL8265_UCODE_API_MIN 22 |
| |
| /* NVM versions */ |
| #define IWL8000_NVM_VERSION 0x0a1d |