Skip to content

Commit 50bb467

Browse files
bjdooks-ctjmberg-intel
authored andcommitted
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 <[email protected]> Reported-by: Neill Whillans <[email protected]> Fixes: 5bc9a9d ("rfkill: allow to get the software rfkill state") Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Johannes Berg <[email protected]>
1 parent 859ae70 commit 50bb467

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

include/linux/rfkill.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,11 @@ static inline bool rfkill_blocked(struct rfkill *rfkill)
308308
return false;
309309
}
310310

311+
static inline bool rfkill_soft_blocked(struct rfkill *rfkill)
312+
{
313+
return false;
314+
}
315+
311316
static inline enum rfkill_type rfkill_find_type(const char *name)
312317
{
313318
return RFKILL_TYPE_ALL;

0 commit comments

Comments
 (0)