On Sat, Nov 02, 2019 at 09:05:18PM +0200, Thomas Backlund wrote:

Den 02-11-2019 kl. 19:52, skrev Luciano Coelho:

...

Hi Thomas,

On Sat, 2019-11-02 at 15:36 +0100, Thomas Deutschmann wrote:

...

Hi,

please backport

<<<<snip From 12e36d98d3e5acf5fc57774e0a15906d55f30cb9 Mon Sep 17 00:00:00 2001 From: Luca Coelho luciano.coelho@intel.com Date: Tue, 8 Oct 2019 13:10:53 +0300 Subject: iwlwifi: exclude GEO SAR support for 3168

We currently support two NICs in FW version 29, namely 7265D and 3168. Out of these, only 7265D supports GEO SAR, so adjust the function that checks for it accordingly.

Signed-off-by: Luca Coelho luciano.coelho@intel.com Fixes: f5a47fae6aa3 ("iwlwifi: mvm: fix version check for GEO_TX_POWER_LIMIT support") Signed-off-by: Luca Coelho luciano.coelho@intel.com snap>>>

This was the first patch of a 2 patch patch series. The second patch, aa0cc7dde17 ("iwlwifi: pcie: change qu with jf devices to use qu configuration") had "Cc: stable@vger.kernel.org # 5.1+" and was added. The first one was missed.

I sent this earlier for stable v5.1, but it's EOL already, so it won't be merged there anymore.

But it's still needed in the active 5.3 tree, and is already queued for 4.19, and since 4.14 also loads api 29, it also needs it...

Luca, does it mean we'd also need fddbfeece9c7 ("iwlwifi: fw: don't send GEO_TX_POWER_LIMIT command to FW version 36") on 4.14? It says 4.19+ but if I'm reading the code (and comments) right we need it on 4.14 too?