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

Merge tag 'mac80211-for-davem-2016-09-13' of... 

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



Johannes Berg says:

====================
A few more fixes:
 * better mesh path fixing, from Thomas
 * fix TIM IE recalculation after sending frames
   to a sleeping station, from Felix
 * fix sequence number assignment while sending
   frames to a sleeping station, also from Felix
 * validate number of probe response CSA counter
   offsets, fixing a copy/paste bug (from myself)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 440f895a ad5987b4

net/mac80211/mesh_hwmp.c

+2 −1
Original line number Diff line number Diff line
@@ -746,6 +746,7 @@ static void hwmp_perr_frame_process(struct ieee80211_sub_if_data *sdata, 
		sta = next_hop_deref_protected(mpath);

		if (mpath->flags & MESH_PATH_ACTIVE &&

		    ether_addr_equal(ta, sta->sta.addr) &&

		    !(mpath->flags & MESH_PATH_FIXED) &&

		    (!(mpath->flags & MESH_PATH_SN_VALID) ||

		    SN_GT(target_sn, mpath->sn)  || target_sn == 0)) {

			mpath->flags &= ~MESH_PATH_ACTIVE;
@@ -1012,7 +1013,7 @@ void mesh_path_start_discovery(struct ieee80211_sub_if_data *sdata) 
		goto enddiscovery;



	spin_lock_bh(&mpath->state_lock);

	if (mpath->flags & MESH_PATH_DELETED) {

	if (mpath->flags & (MESH_PATH_DELETED | MESH_PATH_FIXED)) {

		spin_unlock_bh(&mpath->state_lock);

		goto enddiscovery;

	}

net/mac80211/mesh_pathtbl.c

+1 −1
Original line number Diff line number Diff line
@@ -826,7 +826,7 @@ void mesh_path_fix_nexthop(struct mesh_path *mpath, struct sta_info *next_hop) 
	mpath->metric = 0;

	mpath->hop_count = 0;

	mpath->exp_time = 0;

	mpath->flags |= MESH_PATH_FIXED;

	mpath->flags = MESH_PATH_FIXED | MESH_PATH_SN_VALID;

	mesh_path_activate(mpath);

	spin_unlock_bh(&mpath->state_lock);

	mesh_path_tx_pending(mpath);

net/mac80211/sta_info.c

+2 −2
Original line number Diff line number Diff line
@@ -1616,7 +1616,6 @@ ieee80211_sta_ps_deliver_response(struct sta_info *sta, 


		sta_info_recalc_tim(sta);

	} else {

		unsigned long tids = sta->txq_buffered_tids & driver_release_tids;

		int tid;



		/*
@@ -1648,7 +1647,8 @@ ieee80211_sta_ps_deliver_response(struct sta_info *sta, 
		for (tid = 0; tid < ARRAY_SIZE(sta->sta.txq); tid++) {

			struct txq_info *txqi = to_txq_info(sta->sta.txq[tid]);



			if (!(tids & BIT(tid)) || txqi->tin.backlog_packets)

			if (!(driver_release_tids & BIT(tid)) ||

			    txqi->tin.backlog_packets)

				continue;



			sta_info_recalc_tim(sta);

net/mac80211/tx.c

+33 −32
Original line number Diff line number Diff line
@@ -796,6 +796,36 @@ static __le16 ieee80211_tx_next_seq(struct sta_info *sta, int tid) 
	return ret;

}



static struct txq_info *ieee80211_get_txq(struct ieee80211_local *local,

					  struct ieee80211_vif *vif,

					  struct ieee80211_sta *pubsta,

					  struct sk_buff *skb)

{

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

	struct ieee80211_txq *txq = NULL;



	if ((info->flags & IEEE80211_TX_CTL_SEND_AFTER_DTIM) ||

	    (info->control.flags & IEEE80211_TX_CTRL_PS_RESPONSE))

		return NULL;



	if (!ieee80211_is_data(hdr->frame_control))

		return NULL;



	if (pubsta) {

		u8 tid = skb->priority & IEEE80211_QOS_CTL_TID_MASK;



		txq = pubsta->txq[tid];

	} else if (vif) {

		txq = vif->txq;

	}



	if (!txq)

		return NULL;



	return to_txq_info(txq);

}



static ieee80211_tx_result debug_noinline

ieee80211_tx_h_sequence(struct ieee80211_tx_data *tx)

{
@@ -853,7 +883,8 @@ ieee80211_tx_h_sequence(struct ieee80211_tx_data *tx) 
	tid = *qc & IEEE80211_QOS_CTL_TID_MASK;

	tx->sta->tx_stats.msdu[tid]++;



	if (!tx->sta->sta.txq[0])

	if (!ieee80211_get_txq(tx->local, info->control.vif, &tx->sta->sta,

			       tx->skb))

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



	return TX_CONTINUE;
@@ -1243,36 +1274,6 @@ ieee80211_tx_prepare(struct ieee80211_sub_if_data *sdata, 
	return TX_CONTINUE;

}



static struct txq_info *ieee80211_get_txq(struct ieee80211_local *local,

					  struct ieee80211_vif *vif,

					  struct ieee80211_sta *pubsta,

					  struct sk_buff *skb)

{

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

	struct ieee80211_txq *txq = NULL;



	if ((info->flags & IEEE80211_TX_CTL_SEND_AFTER_DTIM) ||

	    (info->control.flags & IEEE80211_TX_CTRL_PS_RESPONSE))

		return NULL;



	if (!ieee80211_is_data(hdr->frame_control))

		return NULL;



	if (pubsta) {

		u8 tid = skb->priority & IEEE80211_QOS_CTL_TID_MASK;



		txq = pubsta->txq[tid];

	} else if (vif) {

		txq = vif->txq;

	}



	if (!txq)

		return NULL;



	return to_txq_info(txq);

}



static void ieee80211_set_skb_enqueue_time(struct sk_buff *skb)

{

	IEEE80211_SKB_CB(skb)->control.enqueue_time = codel_get_time();
@@ -3264,7 +3265,7 @@ static bool ieee80211_xmit_fast(struct ieee80211_sub_if_data *sdata, 


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

		*ieee80211_get_qos_ctl(hdr) = tid;

		if (!sta->sta.txq[0])

		if (!ieee80211_get_txq(local, &sdata->vif, &sta->sta, skb))

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

	} else {

		info->flags |= IEEE80211_TX_CTL_ASSIGN_SEQ;

net/wireless/nl80211.c

+1 −1
Original line number Diff line number Diff line
@@ -6978,7 +6978,7 @@ static int nl80211_channel_switch(struct sk_buff *skb, struct genl_info *info) 


		params.n_counter_offsets_presp = len / sizeof(u16);

		if (rdev->wiphy.max_num_csa_counters &&

		    (params.n_counter_offsets_beacon >

		    (params.n_counter_offsets_presp >

		     rdev->wiphy.max_num_csa_counters))

			return -EINVAL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE