Commit c651b461 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-for-net-2020-04-24' of... 

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 0303b3a1 8ca47eb9

drivers/net/wireless/intel/iwlegacy/3945-rs.c

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ out: 
}



static void *

il3945_rs_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)

il3945_rs_alloc(struct ieee80211_hw *hw)

{

	return hw->priv;

}

drivers/net/wireless/intel/iwlegacy/4965-rs.c

+1 −1
Original line number Diff line number Diff line
@@ -2474,7 +2474,7 @@ il4965_rs_fill_link_cmd(struct il_priv *il, struct il_lq_sta *lq_sta, 
}



static void *

il4965_rs_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)

il4965_rs_alloc(struct ieee80211_hw *hw)

{

	return hw->priv;

}

drivers/net/wireless/intel/iwlwifi/dvm/rs.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

drivers/net/wireless/intel/iwlwifi/mvm/rs.c

+1 −1
Original line number Diff line number Diff line
@@ -3665,7 +3665,7 @@ static void rs_fill_lq_cmd(struct iwl_mvm *mvm, 
			cpu_to_le16(iwl_mvm_coex_agg_time_limit(mvm, sta));

}



static void *rs_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)

static void *rs_alloc(struct ieee80211_hw *hw)

{

	return hw->priv;

}

drivers/net/wireless/mac80211_hwsim.c

+1 −1
Original line number Diff line number Diff line
@@ -4068,7 +4068,7 @@ static void hwsim_virtio_rx_work(struct work_struct *work) 
	}

	vq = hwsim_vqs[HWSIM_VQ_RX];

	sg_init_one(sg, skb->head, skb_end_offset(skb));

	err = virtqueue_add_inbuf(vq, sg, 1, skb, GFP_KERNEL);

	err = virtqueue_add_inbuf(vq, sg, 1, skb, GFP_ATOMIC);

	if (WARN(err, "virtqueue_add_inbuf returned %d\n", err))

		nlmsg_free(skb);

	else

CRA Git | Maintained and supported by SUSTech CRA and CCSE