diff options
| author | David S. Miller <davem@davemloft.net> | 2021-04-20 16:44:04 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-04-20 16:44:04 -0700 |
| commit | 08322284c1620f01f0ece9907b6125be877e247b (patch) | |
| tree | 5068b7a970e6d332a83aa5f11e39330d3ddd825b /net/rfkill | |
| parent | c9ad20573a91ecfce45404bd0e33913b476613c5 (diff) | |
| parent | 010bfbe768f7ecc876ffba92db30432de4997e2a (diff) | |
| download | linux-08322284c1620f01f0ece9907b6125be877e247b.tar.gz linux-08322284c1620f01f0ece9907b6125be877e247b.tar.bz2 linux-08322284c1620f01f0ece9907b6125be877e247b.zip | |
Merge tag 'mac80211-next-for-net-next-2021-04-20' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
Another set of updates, all over the map:
* set sk_pacing_shift for 802.3->802.11 encap offload
* some monitor support for 802.11->802.3 decap offload
* HE (802.11ax) spec updates
* userspace API for TDLS HE support
* along with various other small features, cleanups and
fixups
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rfkill')
| -rw-r--r-- | net/rfkill/input.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/rfkill/input.c b/net/rfkill/input.c index 4b01baea1d4a..598d0a61bda7 100644 --- a/net/rfkill/input.c +++ b/net/rfkill/input.c @@ -36,7 +36,7 @@ module_param_named(master_switch_mode, rfkill_master_switch_mode, uint, 0); MODULE_PARM_DESC(master_switch_mode, "SW_RFKILL_ALL ON should: 0=do nothing (only unlock); 1=restore; 2=unblock all"); -static spinlock_t rfkill_op_lock; +static DEFINE_SPINLOCK(rfkill_op_lock); static bool rfkill_op_pending; static unsigned long rfkill_sw_pending[BITS_TO_LONGS(NUM_RFKILL_TYPES)]; static unsigned long rfkill_sw_state[BITS_TO_LONGS(NUM_RFKILL_TYPES)]; @@ -330,8 +330,6 @@ int __init rfkill_handler_init(void) return -EINVAL; } - spin_lock_init(&rfkill_op_lock); - /* Avoid delay at first schedule */ rfkill_last_scheduled = jiffies - msecs_to_jiffies(RFKILL_OPS_DELAY) - 1; |