Stable request: iwlwifi: mvm: fix non-ACPI function
Subsystems (2)
From: Johannes Berg <[email protected]>
commit 7937fd3227055892e169f4b34d21157e57d919e2 upstream.
The code now compiles without ACPI, but there's a warning since iwl_mvm_get_ppag_table() isn't used, and iwl_mvm_ppag_init() must not unconditionally fail but return success instead.
[Drop hunk removing iwl_mvm_get_ppag_table() since it doesn't exist in 5.4]
---
A 5.4 kernel can't "up" an iwlwifi interface when CONFIG_ACPI=n. wpa_supplicant or ip link set wlan0 up return "No such file or directory". The non-acpi stub iwl_mvm_ppag_init() always returns -ENOENT which means iwl_mvm_up() always fails. Backporting the commit lets iwl_mvm_up() succeed.
drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/fw.c +1 -1
@@ -1181,7 +1181,7 @@ int iwl_mvm_ppag_send_cmd(struct iwl_mvm *mvm)static int iwl_mvm_ppag_init (struct iwl_mvm *mvm) { -return -ENOENT ; +return 0 ; }#endif /* CONFIG_ACPI */
Signature · 1 line
2.25.1
Quoted 14 lines · Jason Andryuk
From: Johannes Berg <[email protected]>
commit
7937fd3227055892e169f4b34d21157e57d919e2upstream.The code now compiles without ACPI, but there's a warning since
iwl_mvm_get_ppag_table()isn't used, andiwl_mvm_ppag_init()must not unconditionally fail but return success instead.Signed-off-by Johannes Berg <[email protected]>Signed-off-by Luca Coelho <[email protected]>Signed-off-by Kalle Valo <[email protected]>[Drop hunk removing
iwl_mvm_get_ppag_table()since it doesn't exist in 5.4]
Quoted 7 lines
Signed-off-by Jason Andryuk <[email protected]>---
A 5.4 kernel can't "up" an iwlwifi interface whenCONFIG_ACPI=n.wpa_supplicantorip link set wlan0 upreturn "No such file or directory". The non-acpi stubiwl_mvm_ppag_init()always returns-ENOENTwhich meansiwl_mvm_up()always fails. Backporting the commit letsiwl_mvm_up()succeed.
This stable request is only applicable to 5.4
Fixes 6ce1e5c0c207 "iwlwifi: support per-platform antenna gain"
-Jason
Quoted 23 lines · Jason Andryuk
Quoted 14 lines · Jason Andryuk
From: Johannes Berg <[email protected]>
commit
7937fd3227055892e169f4b34d21157e57d919e2upstream.The code now compiles without ACPI, but there's a warning since
iwl_mvm_get_ppag_table()isn't used, andiwl_mvm_ppag_init()must not unconditionally fail but return success instead.Signed-off-by Johannes Berg <[email protected]>Signed-off-by Luca Coelho <[email protected]>Signed-off-by Kalle Valo <[email protected]>[Drop hunk removing
iwl_mvm_get_ppag_table()since it doesn't exist in 5.4]Quoted 7 lines
Signed-off-by Jason Andryuk <[email protected]>---
A 5.4 kernel can't "up" an iwlwifi interface whenCONFIG_ACPI=n.wpa_supplicantorip link set wlan0 upreturn "No such file or directory". The non-acpi stubiwl_mvm_ppag_init()always returns-ENOENTwhich meansiwl_mvm_up()always fails. Backporting the commit letsiwl_mvm_up()succeed.
Quoted 3 lines
This stable request is only applicable to 5.4
Fixes
6ce1e5c0c207"iwlwifi: support per-platform antenna gain"
Now queued up, thanks.
greg k-h