Commit 50bb467c authored by Ben Dooks's avatar Ben Dooks Committed by Johannes Berg
Browse files

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: default avatarBen Dooks <ben.dooks@codethink.co.uk>
Reported-by: default avatarNeill Whillans <neill.whillans@codethink.co.uk>
Fixes: 5bc9a9dd ("rfkill: allow to get the software rfkill state")
Link: https://lore.kernel.org/r/20220218093858.1245677-1-ben.dooks@codethink.co.uk


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 859ae701

include/linux/rfkill.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -308,6 +308,11 @@ static inline bool rfkill_blocked(struct rfkill *rfkill) 
	return false;

	return false;

}

}





static inline bool rfkill_soft_blocked(struct rfkill *rfkill)

{

	return false;

}



static inline enum rfkill_type rfkill_find_type(const char *name)

static inline enum rfkill_type rfkill_find_type(const char *name)

{

{

	return RFKILL_TYPE_ALL;

	return RFKILL_TYPE_ALL;