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

Commit 22f64bd3 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

parents 64b6f46f 5c9fc93b

net/mac80211/cfg.c

+2 −0
Original line number Diff line number Diff line
@@ -666,6 +666,8 @@ static void ieee80211_get_et_stats(struct wiphy *wiphy, 
			if (sta->sdata->dev != dev)

				continue;



			sinfo.filled = 0;

			sta_set_sinfo(sta, &sinfo);

			i = 0;

			ADD_STA_STATS(sta);

		}

net/mac80211/rc80211_minstrel.c

+2 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ minstrel_get_rate(void *priv, struct ieee80211_sta *sta, 
	struct minstrel_rate *msr, *mr;

	unsigned int ndx;

	bool mrr_capable;

	bool prev_sample = mi->prev_sample;

	bool prev_sample;

	int delta;

	int sampling_ratio;
@@ -314,6 +314,7 @@ minstrel_get_rate(void *priv, struct ieee80211_sta *sta, 
			(mi->sample_count + mi->sample_deferred / 2);



	/* delta < 0: no sampling required */

	prev_sample = mi->prev_sample;

	mi->prev_sample = false;

	if (delta < 0 || (!mrr_capable && prev_sample))

		return;

net/mac80211/rc80211_minstrel_ht.c

+9 −1
Original line number Diff line number Diff line
@@ -804,10 +804,18 @@ minstrel_ht_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta, 


	sample_group = &minstrel_mcs_groups[sample_idx / MCS_GROUP_RATES];

	info->flags |= IEEE80211_TX_CTL_RATE_CTRL_PROBE;

	rate->count = 1;



	if (sample_idx / MCS_GROUP_RATES == MINSTREL_CCK_GROUP) {

		int idx = sample_idx % ARRAY_SIZE(mp->cck_rates);

		rate->idx = mp->cck_rates[idx];

		rate->flags = 0;

		return;

	}



	rate->idx = sample_idx % MCS_GROUP_RATES +

		    (sample_group->streams - 1) * MCS_GROUP_RATES;

	rate->flags = IEEE80211_TX_RC_MCS | sample_group->flags;

	rate->count = 1;

}



static void

net/mac80211/rx.c

+8 −2
Original line number Diff line number Diff line
@@ -936,8 +936,14 @@ ieee80211_rx_h_check(struct ieee80211_rx_data *rx) 
	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data;

	struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(rx->skb);



	/* Drop duplicate 802.11 retransmissions (IEEE 802.11 Chap. 9.2.9) */

	if (rx->sta && !is_multicast_ether_addr(hdr->addr1)) {

	/*

	 * Drop duplicate 802.11 retransmissions

	 * (IEEE 802.11-2012: 9.3.2.10 "Duplicate detection and recovery")

	 */

	if (rx->skb->len >= 24 && rx->sta &&

	    !ieee80211_is_ctl(hdr->frame_control) &&

	    !ieee80211_is_qos_nullfunc(hdr->frame_control) &&

	    !is_multicast_ether_addr(hdr->addr1)) {

		if (unlikely(ieee80211_has_retry(hdr->frame_control) &&

			     rx->sta->last_seq_ctrl[rx->seqno_idx] ==

			     hdr->seq_ctrl)) {

net/wireless/nl80211.c

+7 −4
Original line number Diff line number Diff line
@@ -4770,9 +4770,9 @@ do { \ 
	FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshForwarding, 0, 1,

				  mask, NL80211_MESHCONF_FORWARDING,

				  nla_get_u8);

	FILL_IN_MESH_PARAM_IF_SET(tb, cfg, rssi_threshold, 1, 255,

	FILL_IN_MESH_PARAM_IF_SET(tb, cfg, rssi_threshold, -255, 0,

				  mask, NL80211_MESHCONF_RSSI_THRESHOLD,

				  nla_get_u32);

				  nla_get_s32);

	FILL_IN_MESH_PARAM_IF_SET(tb, cfg, ht_opmode, 0, 16,

				  mask, NL80211_MESHCONF_HT_OPMODE,

				  nla_get_u16);
@@ -6613,12 +6613,14 @@ EXPORT_SYMBOL(cfg80211_testmode_alloc_event_skb); 


void cfg80211_testmode_event(struct sk_buff *skb, gfp_t gfp)

{

	struct cfg80211_registered_device *rdev = ((void **)skb->cb)[0];

	void *hdr = ((void **)skb->cb)[1];

	struct nlattr *data = ((void **)skb->cb)[2];



	nla_nest_end(skb, data);

	genlmsg_end(skb, hdr);

	genlmsg_multicast(skb, 0, nl80211_testmode_mcgrp.id, gfp);

	genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), skb, 0,

				nl80211_testmode_mcgrp.id, gfp);

}

EXPORT_SYMBOL(cfg80211_testmode_event);

#endif
@@ -10064,7 +10066,8 @@ void cfg80211_mgmt_tx_status(struct wireless_dev *wdev, u64 cookie, 


	genlmsg_end(msg, hdr);



	genlmsg_multicast(msg, 0, nl80211_mlme_mcgrp.id, gfp);

	genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,

				nl80211_mlme_mcgrp.id, gfp);

	return;



 nla_put_failure: