Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'mac80211-for-davem-2016-11-18' of... 

Merge tag 'mac80211-for-davem-2016-11-18' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg says:

====================
A few more bugfixes:
 * limit # of scan results stored in memory - this is a long-standing bug
   Jouni and I only noticed while discussing other things in Santa Fe
 * revert AP_LINK_PS patch that was causing issues (Felix)
 * various A-MSDU/A-MPDU fixes for TXQ code (Felix)
 * interoperability workaround for peers with broken VHT capabilities
   (Filip Matusiak)
 * add bitrate definition for a VHT MCS that's supposed to be invalid
   but gets used by some hardware anyway (Thomas Pedersen)
 * beacon timer fix in hwsim (Benjamin Beichler)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 06a77b07 9853a55e

drivers/net/wireless/mac80211_hwsim.c

+1 −1
Original line number Diff line number Diff line
@@ -826,7 +826,7 @@ static void mac80211_hwsim_set_tsf(struct ieee80211_hw *hw, 
		data->bcn_delta = do_div(delta, bcn_int);

	} else {

		data->tsf_offset -= delta;

		data->bcn_delta = -do_div(delta, bcn_int);

		data->bcn_delta = -(s64)do_div(delta, bcn_int);

	}

}

net/mac80211/sta_info.c

+1 −1
Original line number Diff line number Diff line
@@ -688,7 +688,7 @@ static void __sta_info_recalc_tim(struct sta_info *sta, bool ignore_pending) 
	}



	/* No need to do anything if the driver does all */

	if (!local->ops->set_tim)

	if (ieee80211_hw_check(&local->hw, AP_LINK_PS))

		return;



	if (sta->dead)

net/mac80211/tx.c

+10 −4
Original line number Diff line number Diff line
@@ -1501,7 +1501,6 @@ static bool ieee80211_queue_skb(struct ieee80211_local *local, 
				struct sta_info *sta,

				struct sk_buff *skb)

{

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

	struct fq *fq = &local->fq;

	struct ieee80211_vif *vif;

	struct txq_info *txqi;
@@ -1526,8 +1525,6 @@ static bool ieee80211_queue_skb(struct ieee80211_local *local, 
	if (!txqi)

		return false;



	info->control.vif = vif;



	spin_lock_bh(&fq->lock);

	ieee80211_txq_enqueue(local, txqi, skb);

	spin_unlock_bh(&fq->lock);
@@ -3213,7 +3210,6 @@ static void ieee80211_xmit_fast_finish(struct ieee80211_sub_if_data *sdata, 


	if (hdr->frame_control & cpu_to_le16(IEEE80211_STYPE_QOS_DATA)) {

		tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK;

		*ieee80211_get_qos_ctl(hdr) = tid;

		hdr->seq_ctrl = ieee80211_tx_next_seq(sta, tid);

	} else {

		info->flags |= IEEE80211_TX_CTL_ASSIGN_SEQ;
@@ -3338,6 +3334,11 @@ static bool ieee80211_xmit_fast(struct ieee80211_sub_if_data *sdata, 
		      (tid_tx ? IEEE80211_TX_CTL_AMPDU : 0);

	info->control.flags = IEEE80211_TX_CTRL_FAST_XMIT;



	if (hdr->frame_control & cpu_to_le16(IEEE80211_STYPE_QOS_DATA)) {

		tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK;

		*ieee80211_get_qos_ctl(hdr) = tid;

	}



	__skb_queue_head_init(&tx.skbs);



	tx.flags = IEEE80211_TX_UNICAST;
@@ -3426,6 +3427,11 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw, 
		goto begin;

	}



	if (test_bit(IEEE80211_TXQ_AMPDU, &txqi->flags))

		info->flags |= IEEE80211_TX_CTL_AMPDU;

	else

		info->flags &= ~IEEE80211_TX_CTL_AMPDU;



	if (info->control.flags & IEEE80211_TX_CTRL_FAST_XMIT) {

		struct sta_info *sta = container_of(txq->sta, struct sta_info,

						    sta);

net/mac80211/vht.c

+16 −0
Original line number Diff line number Diff line
@@ -270,6 +270,22 @@ ieee80211_vht_cap_ie_to_sta_vht_cap(struct ieee80211_sub_if_data *sdata, 
		vht_cap->vht_mcs.tx_mcs_map |= cpu_to_le16(peer_tx << i * 2);

	}



	/*

	 * This is a workaround for VHT-enabled STAs which break the spec

	 * and have the VHT-MCS Rx map filled in with value 3 for all eight

	 * spacial streams, an example is AR9462.

	 *

	 * As per spec, in section 22.1.1 Introduction to the VHT PHY

	 * A VHT STA shall support at least single spactial stream VHT-MCSs

	 * 0 to 7 (transmit and receive) in all supported channel widths.

	 */

	if (vht_cap->vht_mcs.rx_mcs_map == cpu_to_le16(0xFFFF)) {

		vht_cap->vht_supported = false;

		sdata_info(sdata, "Ignoring VHT IE from %pM due to invalid rx_mcs_map\n",

			   sta->addr);

		return;

	}



	/* finally set up the bandwidth */

	switch (vht_cap->cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK) {

	case IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ:

net/wireless/core.h

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ struct cfg80211_registered_device { 
	struct list_head bss_list;

	struct rb_root bss_tree;

	u32 bss_generation;

	u32 bss_entries;

	struct cfg80211_scan_request *scan_req; /* protected by RTNL */

	struct sk_buff *scan_msg;

	struct cfg80211_sched_scan_request __rcu *sched_scan_req;