Luca Coelho <luca@xxxxxxxxx> writes: > On Thu, 2017-04-20 at 07:59 +0300, Luca Coelho wrote: >> Here's v2 of my second pull-request intended for v4.12. It includes the >> last three patch series I sent out, namely 2017-04-13, 2017-04-19 and >> the 2 fixes by Johannes that I sent a few minutes ago. >> >> I also removed the "bump API to 31" patch. I'll send a diff between >> this tag and the HEAD of the patches I sent in the 2017-04-19 series. > > This is the diffenrece between my pending branch (which contains all the > patches up to 2017-04-19) and this pull-request. For the record of what > I had to change. > > > diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c > b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c > index 904e17956e2c..b9718c0cf174 100644 > --- a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c > +++ b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c > @@ -70,8 +70,8 @@ > #include "iwl-agn-hw.h" > > /* Highest firmware API version supported */ > -#define IWL8000_UCODE_API_MAX 31 > -#define IWL8265_UCODE_API_MAX 31 > +#define IWL8000_UCODE_API_MAX 30 > +#define IWL8265_UCODE_API_MAX 30 > > /* Lowest firmware API version supported */ > #define IWL8000_UCODE_API_MIN 17 > diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-9000.c > b/drivers/net/wireless/intel/iwlwifi/iwl-9000.c > index 42a6e723191e..110ceefccc15 100644 > --- a/drivers/net/wireless/intel/iwlwifi/iwl-9000.c > +++ b/drivers/net/wireless/intel/iwlwifi/iwl-9000.c > @@ -55,7 +55,7 @@ > #include "iwl-agn-hw.h" > > /* Highest firmware API version supported */ > -#define IWL9000_UCODE_API_MAX 31 > +#define IWL9000_UCODE_API_MAX 30 > > /* Lowest firmware API version supported */ > #define IWL9000_UCODE_API_MIN 30 > diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-a000.c > b/drivers/net/wireless/intel/iwlwifi/iwl-a000.c > index 6d745c36f1d8..097cb45c8ad9 100644 > --- a/drivers/net/wireless/intel/iwlwifi/iwl-a000.c > +++ b/drivers/net/wireless/intel/iwlwifi/iwl-a000.c > @@ -55,7 +55,7 @@ > #include "iwl-agn-hw.h" > > /* Highest firmware API version supported */ > -#define IWL_A000_UCODE_API_MAX 31 > +#define IWL_A000_UCODE_API_MAX 30 Good that you dropped this. I was a bit worried that if it the API bump was too soon and inconvenient for the users. -- Kalle Valo
