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

Merge tag 'mac80211-for-davem-2016-02-23' of... 

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



Johannes Berg says:

====================
Another small set of fixes:
 * stop critical protocol session on disconnect to avoid
   it getting stuck
 * wext: fix two RTNL message ordering issues
 * fix an uninitialized value (found by KASAN)
 * fix an out-of-bounds access (also found by KASAN)
 * clear connection keys when freeing them in all cases
   (IBSS, all other places already did so)
 * fix expected throughput unit to get consistent values
 * set default TX aggregation timeout to 0 in minstrel
   to avoid (really just hide) issues and perform better
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2da897e5 b8607152

include/net/iw_handler.h

+6 −0
Original line number Diff line number Diff line
@@ -439,6 +439,12 @@ int dev_get_wireless_info(char *buffer, char **start, off_t offset, int length); 
/* Send a single event to user space */

void wireless_send_event(struct net_device *dev, unsigned int cmd,

			 union iwreq_data *wrqu, const char *extra);

#ifdef CONFIG_WEXT_CORE

/* flush all previous wext events - if work is done from netdev notifiers */

void wireless_nlevent_flush(void);

#else

static inline void wireless_nlevent_flush(void) {}

#endif



/* We may need a function to send a stream of events to user space.

 * More on that later... */

net/mac80211/agg-rx.c

+1 −1
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ void __ieee80211_start_rx_ba_session(struct sta_info *sta, 
	}



	/* prepare A-MPDU MLME for Rx aggregation */

	tid_agg_rx = kmalloc(sizeof(struct tid_ampdu_rx), GFP_KERNEL);

	tid_agg_rx = kzalloc(sizeof(*tid_agg_rx), GFP_KERNEL);

	if (!tid_agg_rx)

		goto end;

net/mac80211/rc80211_minstrel.c

+1 −1
Original line number Diff line number Diff line
@@ -711,7 +711,7 @@ static u32 minstrel_get_expected_throughput(void *priv_sta) 
	 * computing cur_tp

	 */

	tmp_mrs = &mi->r[idx].stats;

	tmp_cur_tp = minstrel_get_tp_avg(&mi->r[idx], tmp_mrs->prob_ewma);

	tmp_cur_tp = minstrel_get_tp_avg(&mi->r[idx], tmp_mrs->prob_ewma) * 10;

	tmp_cur_tp = tmp_cur_tp * 1200 * 8 / 1024;



	return tmp_cur_tp;

net/mac80211/rc80211_minstrel_ht.c

+8 −6
Original line number Diff line number Diff line
@@ -414,15 +414,16 @@ minstrel_ht_set_best_prob_rate(struct minstrel_ht_sta *mi, u16 index) 
	    (max_tp_group != MINSTREL_CCK_GROUP))

		return;



	max_gpr_group = mg->max_group_prob_rate / MCS_GROUP_RATES;

	max_gpr_idx = mg->max_group_prob_rate % MCS_GROUP_RATES;

	max_gpr_prob = mi->groups[max_gpr_group].rates[max_gpr_idx].prob_ewma;



	if (mrs->prob_ewma > MINSTREL_FRAC(75, 100)) {

		cur_tp_avg = minstrel_ht_get_tp_avg(mi, cur_group, cur_idx,

						    mrs->prob_ewma);

		if (cur_tp_avg > tmp_tp_avg)

			mi->max_prob_rate = index;



		max_gpr_group = mg->max_group_prob_rate / MCS_GROUP_RATES;

		max_gpr_idx = mg->max_group_prob_rate %	MCS_GROUP_RATES;

		max_gpr_prob = mi->groups[max_gpr_group].rates[max_gpr_idx].prob_ewma;

		max_gpr_tp_avg = minstrel_ht_get_tp_avg(mi, max_gpr_group,

							max_gpr_idx,

							max_gpr_prob);
@@ -431,7 +432,7 @@ minstrel_ht_set_best_prob_rate(struct minstrel_ht_sta *mi, u16 index) 
	} else {

		if (mrs->prob_ewma > tmp_prob)

			mi->max_prob_rate = index;

		if (mrs->prob_ewma > mg->rates[mg->max_group_prob_rate].prob_ewma)

		if (mrs->prob_ewma > max_gpr_prob)

			mg->max_group_prob_rate = index;

	}

}
@@ -691,7 +692,7 @@ minstrel_aggr_check(struct ieee80211_sta *pubsta, struct sk_buff *skb) 
	if (likely(sta->ampdu_mlme.tid_tx[tid]))

		return;



	ieee80211_start_tx_ba_session(pubsta, tid, 5000);

	ieee80211_start_tx_ba_session(pubsta, tid, 0);

}



static void
@@ -1334,7 +1335,8 @@ static u32 minstrel_ht_get_expected_throughput(void *priv_sta) 
	prob = mi->groups[i].rates[j].prob_ewma;



	/* convert tp_avg from pkt per second in kbps */

	tp_avg = minstrel_ht_get_tp_avg(mi, i, j, prob) * AVG_PKT_SIZE * 8 / 1024;

	tp_avg = minstrel_ht_get_tp_avg(mi, i, j, prob) * 10;

	tp_avg = tp_avg * AVG_PKT_SIZE * 8 / 1024;



	return tp_avg;

}

net/wireless/core.c

+2 −0
Original line number Diff line number Diff line
@@ -1147,6 +1147,8 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb, 
		return NOTIFY_DONE;

	}



	wireless_nlevent_flush();



	return NOTIFY_OK;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE