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

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

Merge tag 'mac80211-next-for-davem-2016-08-12' of... 

Merge tag 'mac80211-next-for-davem-2016-08-12' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next



Johannes Berg says:

====================
Not much for -next so far, but here it goes:
 * send more nl80211 events for interfaces
 * remove useless network/transport offset mangling code
 * validate beacon intervals identically for all interface types
 * use driver rate estimates for mesh
 * fix a compiler type/signedness warning
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 70567833 ff9a71af

net/mac80211/driver-ops.h

+4 −4
Original line number Diff line number Diff line
@@ -1088,13 +1088,13 @@ static inline void drv_leave_ibss(struct ieee80211_local *local, 
}



static inline u32 drv_get_expected_throughput(struct ieee80211_local *local,

					      struct ieee80211_sta *sta)

					      struct sta_info *sta)

{

	u32 ret = 0;



	trace_drv_get_expected_throughput(sta);

	if (local->ops->get_expected_throughput)

		ret = local->ops->get_expected_throughput(&local->hw, sta);

	trace_drv_get_expected_throughput(&sta->sta);

	if (local->ops->get_expected_throughput && sta->uploaded)

		ret = local->ops->get_expected_throughput(&local->hw, &sta->sta);

	trace_drv_return_u32(local, ret);



	return ret;

net/mac80211/mesh_hwmp.c

+19 −8
Original line number Diff line number Diff line
@@ -326,6 +326,16 @@ static u32 airtime_link_metric_get(struct ieee80211_local *local, 
	u32 tx_time, estimated_retx;

	u64 result;



	/* Try to get rate based on HW/SW RC algorithm.

	 * Rate is returned in units of Kbps, correct this

	 * to comply with airtime calculation units

	 * Round up in case we get rate < 100Kbps

	 */

	rate = DIV_ROUND_UP(sta_get_expected_throughput(sta), 100);



	if (rate) {

		err = 0;

	} else {

		if (sta->mesh->fail_avg >= 100)

			return MAX_METRIC;
@@ -335,6 +345,7 @@ static u32 airtime_link_metric_get(struct ieee80211_local *local, 
			return MAX_METRIC;



		err = (sta->mesh->fail_avg << ARITH_SHIFT) / 100;

	}



	/* bitrate is in units of 100 Kbps, while we need rate in units of

	 * 1Mbps. This will be corrected on tx_time computation.

net/mac80211/sta_info.c

+20 −5
Original line number Diff line number Diff line
@@ -2279,11 +2279,7 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo) 
	if (test_sta_flag(sta, WLAN_STA_TDLS_PEER))

		sinfo->sta_flags.set |= BIT(NL80211_STA_FLAG_TDLS_PEER);



	/* check if the driver has a SW RC implementation */

	if (ref && ref->ops->get_expected_throughput)

		thr = ref->ops->get_expected_throughput(sta->rate_ctrl_priv);

	else

		thr = drv_get_expected_throughput(local, &sta->sta);

	thr = sta_get_expected_throughput(sta);



	if (thr != 0) {

		sinfo->filled |= BIT(NL80211_STA_INFO_EXPECTED_THROUGHPUT);
@@ -2291,6 +2287,25 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo) 
	}

}



u32 sta_get_expected_throughput(struct sta_info *sta)

{

	struct ieee80211_sub_if_data *sdata = sta->sdata;

	struct ieee80211_local *local = sdata->local;

	struct rate_control_ref *ref = NULL;

	u32 thr = 0;



	if (test_sta_flag(sta, WLAN_STA_RATE_CONTROL))

		ref = local->rate_ctrl;



	/* check if the driver has a SW RC implementation */

	if (ref && ref->ops->get_expected_throughput)

		thr = ref->ops->get_expected_throughput(sta->rate_ctrl_priv);

	else

		thr = drv_get_expected_throughput(local, sta);



	return thr;

}



unsigned long ieee80211_sta_last_active(struct sta_info *sta)

{

	struct ieee80211_sta_rx_stats *stats = sta_get_last_rx_stats(sta);

net/mac80211/sta_info.h

+2 −0
Original line number Diff line number Diff line
@@ -712,6 +712,8 @@ void sta_set_rate_info_tx(struct sta_info *sta, 
			  struct rate_info *rinfo);

void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo);



u32 sta_get_expected_throughput(struct sta_info *sta);



void ieee80211_sta_expire(struct ieee80211_sub_if_data *sdata,

			  unsigned long exp_time);

u8 sta_info_tx_streams(struct sta_info *sta);

net/mac80211/tx.c

+2 −26
Original line number Diff line number Diff line
@@ -2334,7 +2334,6 @@ static struct sk_buff *ieee80211_build_hdr(struct ieee80211_sub_if_data *sdata, 
	struct mesh_path __maybe_unused *mppath = NULL, *mpath = NULL;

	const u8 *encaps_data;

	int encaps_len, skip_header_bytes;

	int nh_pos, h_pos;

	bool wme_sta = false, authorized = false;

	bool tdls_peer;

	bool multicast;
@@ -2640,13 +2639,7 @@ static struct sk_buff *ieee80211_build_hdr(struct ieee80211_sub_if_data *sdata, 
		encaps_len = 0;

	}



	nh_pos = skb_network_header(skb) - skb->data;

	h_pos = skb_transport_header(skb) - skb->data;



	skb_pull(skb, skip_header_bytes);

	nh_pos -= skip_header_bytes;

	h_pos -= skip_header_bytes;



	head_need = hdrlen + encaps_len + meshhdrlen - skb_headroom(skb);



	/*
@@ -2672,18 +2665,12 @@ static struct sk_buff *ieee80211_build_hdr(struct ieee80211_sub_if_data *sdata, 
		}

	}



	if (encaps_data) {

	if (encaps_data)

		memcpy(skb_push(skb, encaps_len), encaps_data, encaps_len);

		nh_pos += encaps_len;

		h_pos += encaps_len;

	}



#ifdef CONFIG_MAC80211_MESH

	if (meshhdrlen > 0) {

	if (meshhdrlen > 0)

		memcpy(skb_push(skb, meshhdrlen), &mesh_hdr, meshhdrlen);

		nh_pos += meshhdrlen;

		h_pos += meshhdrlen;

	}

#endif



	if (ieee80211_is_data_qos(fc)) {
@@ -2699,15 +2686,7 @@ static struct sk_buff *ieee80211_build_hdr(struct ieee80211_sub_if_data *sdata, 
	} else

		memcpy(skb_push(skb, hdrlen), &hdr, hdrlen);



	nh_pos += hdrlen;

	h_pos += hdrlen;



	/* Update skb pointers to various headers since this modified frame

	 * is going to go through Linux networking code that may potentially

	 * need things like pointer to IP header. */

	skb_reset_mac_header(skb);

	skb_set_network_header(skb, nh_pos);

	skb_set_transport_header(skb, h_pos);



	info = IEEE80211_SKB_CB(skb);

	memset(info, 0, sizeof(*info));
@@ -4390,9 +4369,6 @@ void __ieee80211_tx_skb_tid_band(struct ieee80211_sub_if_data *sdata, 
	int ac = ieee802_1d_to_ac[tid & 7];



	skb_reset_mac_header(skb);

	skb_reset_network_header(skb);

	skb_reset_transport_header(skb);



	skb_set_queue_mapping(skb, ac);

	skb->priority = tid;