[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20220218093858.1245677-1-ben.dooks@codethink.co.uk>
Date: Fri, 18 Feb 2022 09:38:58 +0000
From: Ben Dooks <ben.dooks@...ethink.co.uk>
To: linux-kernel@...ts.codethink.co.uk,
Johannes Berg <johannes@...solutions.net>,
linux-wireless@...r.kernel.org
Cc: linux-kernel@...r.kernel.org,
Emmanuel Grumbach <emmanuel.grumbach@...el.com>,
Ben Dooks <ben.dooks@...ethink.co.uk>,
Neill Whillans <neill.whillans@...ethink.co.uk>
Subject: [PATCH] rfkill: define rfill_soft_blocked() if \!RFKILL
If CONFIG_RFKILL is not set, the Intel WiFi driver will not build
the iw_mvm driver part due to the missing rfill_soft_blocked()
call. Adding a inline declaration of rfill_soft_blocked() if
CONFIG_RFKILL=n fixes the following error:
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h: In function 'iwl_mvm_mei_set_sw_rfkill_state':
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h:2215:38: error: implicit declaration of function 'rfkill_soft_blocked'; did you mean 'rfkill_blocked'? [-Werror=implicit-function-declaration]
2215 | mvm->hw_registered ? rfkill_soft_blocked(mvm->hw->wiphy->rfkill) : false;
| ^~~~~~~~~~~~~~~~~~~
| rfkill_blocked
Signed-off-by: Ben Dooks <ben.dooks@...ethink.co.uk>
Reported-by: Neill Whillans <neill.whillans@...ethink.co.uk>
Fixes: 7cf800f46e07e6b75a43036c4389d6ca717fd017 ("iwlwifi: mvm: don't feed the hardware RFKILL into iwlmei
")
---
include/linux/rfkill.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
index c35f3962dc4f..373003ace639 100644
--- a/include/linux/rfkill.h
+++ b/include/linux/rfkill.h
@@ -308,6 +308,11 @@ static inline bool rfkill_blocked(struct rfkill *rfkill)
return false;
}
+static inline bool rfkill_soft_blocked(struct rfkill *rfkill)
+{
+ return false;
+}
+
static inline enum rfkill_type rfkill_find_type(const char *name)
{
return RFKILL_TYPE_ALL;
--
2.34.1
Powered by blists - more mailing lists