diff options
author | Johannes Berg <johannes.berg@intel.com> | 2019-08-30 14:24:44 +0300 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2019-09-11 10:13:26 +0300 |
commit | 3cfe91c4c3c080c6af95611a87f8cf32d1913896 (patch) | |
tree | cb37ec244f749f948a4dda98dc7cb13bdb75dcd7 /net/wireless/core.h | |
parent | e5c0b0fff6b19238eb0f33ec58247db3e5295cdd (diff) | |
download | linux-3cfe91c4c3c080c6af95611a87f8cf32d1913896.tar.xz |
cfg80211: always shut down on HW rfkill
When the RFKILL subsystem isn't available, then rfkill_blocked()
always returns false. In the case of hardware rfkill this will
be wrong though, as if the hardware reported being killed then
it cannot operate any longer.
Since we only ever call the rfkill_sync work in this case, just
rename it to rfkill_block and always pass "true" for the blocked
parameter, rather than passing rfkill_blocked().
We rely on the underlying driver to still reject any new attempt
to bring up the device by itself.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/20190830112451.21655-2-luca@coelho.fi
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/core.h')
-rw-r--r-- | net/wireless/core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/core.h b/net/wireless/core.h index 77556c58d9ac..ed487e324571 100644 --- a/net/wireless/core.h +++ b/net/wireless/core.h @@ -28,7 +28,7 @@ struct cfg80211_registered_device { /* rfkill support */ struct rfkill_ops rfkill_ops; struct rfkill *rfkill; - struct work_struct rfkill_sync; + struct work_struct rfkill_block; /* ISO / IEC 3166 alpha2 for which this device is receiving * country IEs on, this can help disregard country IEs from APs |