diff options
| author | David S. Miller <davem@davemloft.net> | 2020-04-24 13:17:01 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-04-24 13:17:01 -0700 |
| commit | c651b461b55b82029f1e78e9430bde1a0d7ec5af (patch) | |
| tree | cd2e94423877e6024e00c1e4ff0e661e17361db0 /drivers/net/wireless/intel/iwlwifi/dvm/rs.c | |
| parent | 0303b3a168080934a370a570ba162072139eedbe (diff) | |
| parent | 8ca47eb9f9e4e10e7e7fa695731a88941732c38d (diff) | |
Merge tag 'mac80211-for-net-2020-04-24' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
Just three changes:
* fix a wrong GFP_KERNEL in hwsim
* fix the debugfs mess after the mac80211 registration race fix
* suppress false-positive RCU list lockdep warnings
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/dvm/rs.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/dvm/rs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/rs.c b/drivers/net/wireless/intel/iwlwifi/dvm/rs.c index 226165db7dfd..dac809df7f1d 100644 --- a/drivers/net/wireless/intel/iwlwifi/dvm/rs.c +++ b/drivers/net/wireless/intel/iwlwifi/dvm/rs.c @@ -3019,7 +3019,7 @@ static void rs_fill_link_cmd(struct iwl_priv *priv, cpu_to_le16(priv->lib->bt_params->agg_time_limit); } -static void *rs_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir) +static void *rs_alloc(struct ieee80211_hw *hw) { return hw->priv; } |