niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

cfg80211: allow specifying a reason for hw_rfkill

Browse source 
rfkill now allows to report a reason for the hw_rfkill state.
Allow cfg80211 drivers to specify this reason.
Keep the current API to use the default reason
(RFKILL_HARD_BLOCK_SIGNAL).

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Link: https://lore.kernel.org/r/20210322204633.102581-4-emmanuel.grumbach@intel.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Emmanuel Grumbach 2021-03-22 22:46:31 +02:00 • committed by Johannes Berg
parent 0750cfd8b7
commit 6f779a66dc
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/net/cfg80211.h
View file

@ -11,6 +11,7 @@
*/ */
#include <linux/ethtool.h> #include <linux/ethtool.h>
#include <uapi/linux/rfkill.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/list.h> #include <linux/list.h>
@ -6636,8 +6637,16 @@ void cfg80211_notify_new_peer_candidate(struct net_device *dev,
* wiphy_rfkill_set_hw_state - notify cfg80211 about hw block state * wiphy_rfkill_set_hw_state - notify cfg80211 about hw block state
* @wiphy: the wiphy * @wiphy: the wiphy
* @blocked: block status * @blocked: block status
* @reason: one of reasons in &enum rfkill_hard_block_reasons
*/ */
void wiphy_rfkill_set_hw_state(struct wiphy *wiphy, bool blocked); void wiphy_rfkill_set_hw_state_reason(struct wiphy *wiphy, bool blocked,
enum rfkill_hard_block_reasons reason);
static inline void wiphy_rfkill_set_hw_state(struct wiphy *wiphy, bool blocked)
{
wiphy_rfkill_set_hw_state_reason(wiphy, blocked,
RFKILL_HARD_BLOCK_SIGNAL);
}
/** /**
* wiphy_rfkill_start_polling - start polling rfkill * wiphy_rfkill_start_polling - start polling rfkill

7
net/wireless/core.c
View file

@ -1092,14 +1092,15 @@ void wiphy_free(struct wiphy *wiphy)
} }
EXPORT_SYMBOL(wiphy_free); EXPORT_SYMBOL(wiphy_free);
void wiphy_rfkill_set_hw_state(struct wiphy *wiphy, bool blocked) void wiphy_rfkill_set_hw_state_reason(struct wiphy *wiphy, bool blocked,
enum rfkill_hard_block_reasons reason)
{ {
struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy); struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy);
if (rfkill_set_hw_state(rdev->rfkill, blocked)) if (rfkill_set_hw_state_reason(rdev->rfkill, blocked, reason))
schedule_work(&rdev->rfkill_block); schedule_work(&rdev->rfkill_block);
} }
EXPORT_SYMBOL(wiphy_rfkill_set_hw_state); EXPORT_SYMBOL(wiphy_rfkill_set_hw_state_reason);
void cfg80211_cqm_config_free(struct wireless_dev *wdev) void cfg80211_cqm_config_free(struct wireless_dev *wdev)
{ {