From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
To: kvalo@codeaurora.org
Cc: johannes@sipsolutions.net, linux-wireless@vger.kernel.org,
luca@coelho.fi, Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Subject: [PATCH 3/5] cfg80211: allow to specifying a reason for hw_rfkill
Date: Mon, 22 Mar 2021 22:41:53 +0200 [thread overview]
Message-ID: <20210322204157.102078-4-emmanuel.grumbach@intel.com> (raw)
In-Reply-To: <20210322204157.102078-1-emmanuel.grumbach@intel.com>
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>
---
include/net/cfg80211.h | 11 ++++++++++-
net/wireless/core.c | 7 ++++---
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 911fae42b0c0..3b296f2b7a2c 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -11,6 +11,7 @@
*/
#include <linux/ethtool.h>
+#include <uapi/linux/rfkill.h>
#include <linux/netdevice.h>
#include <linux/debugfs.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: the wiphy
* @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
diff --git a/net/wireless/core.c b/net/wireless/core.c
index a2785379df6e..adfbcb33fb8f 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -1092,14 +1092,15 @@ void wiphy_free(struct wiphy *wiphy)
}
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);
- if (rfkill_set_hw_state(rdev->rfkill, blocked))
+ if (rfkill_set_hw_state_reason(rdev->rfkill, blocked, reason))
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)
{
--
2.25.1
next prev parent reply other threads:[~2021-03-22 20:43 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-22 20:41 [PATCH 0/5] Add support for AMT over WLAN Emmanuel Grumbach
2021-03-22 20:41 ` [PATCH 1/5] mei: allow map and unmap of client dma buffer only for disconnected client Emmanuel Grumbach
2021-03-22 20:41 ` [PATCH 2/5] mei: bus: add client dma interface Emmanuel Grumbach
2021-03-22 20:41 ` Emmanuel Grumbach [this message]
2021-03-22 20:41 ` [PATCH 3/4] iwlwifi: mei: add the driver to allow cooperation with CSME Emmanuel Grumbach
2021-03-22 20:41 ` [PATCH 4/4] iwlwifi: integrate with iwlmei Emmanuel Grumbach
2021-03-22 20:41 ` [PATCH 4/5] iwlwifi: mei: add the driver to allow cooperation with CSME Emmanuel Grumbach
2021-03-22 20:41 ` [PATCH 5/5] iwlwifi: integrate with iwlmei Emmanuel Grumbach
2021-03-22 20:47 ` [PATCH 0/5] Add support for AMT over WLAN Emmanuel Grumbach
2021-03-22 20:46 [RESEND PATCH " Emmanuel Grumbach
2021-03-22 20:46 ` [PATCH 3/5] cfg80211: allow to specifying a reason for hw_rfkill Emmanuel Grumbach
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210322204157.102078-4-emmanuel.grumbach@intel.com \
--to=emmanuel.grumbach@intel.com \
--cc=johannes@sipsolutions.net \
--cc=kvalo@codeaurora.org \
--cc=linux-wireless@vger.kernel.org \
--cc=luca@coelho.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).