Commit 190355cc authored by John W. Linville's avatar John W. Linville
Browse files

Merge tag 'mac80211-for-john-2014-08-29' of... 

Merge tag 'mac80211-for-john-2014-08-29' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg <johannes@sipsolutions.net> says:

"Here are a few fixes for mac80211. One has been discussed for a while
and adds a terminating NUL-byte to the alpha2 sent to userspace, which
shouldn't be necessary but since many places treat it as a string we
couldn't move to just sending two bytes.

In addition to that, we have two VLAN fixes from Felix, a mesh fix, a
fix for the recently introduced RX aggregation offload, a revert for
a broken patch (that luckily didn't really cause any harm) and a small
fix for alignment in debugfs."

Signed-off-by: default avatarJohn W. Linville <linville@redhat.com>
parents c6651716 14b058bb

include/net/regulatory.h

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ struct ieee80211_reg_rule { 
struct ieee80211_regdomain {

	struct rcu_head rcu_head;

	u32 n_reg_rules;

	char alpha2[2];

	char alpha2[3];

	enum nl80211_dfs_regions dfs_region;

	struct ieee80211_reg_rule reg_rules[];

};

net/mac80211/chan.c

+2 −0
Original line number Diff line number Diff line
@@ -541,6 +541,8 @@ static void ieee80211_recalc_chanctx_chantype(struct ieee80211_local *local, 
			continue;

		if (rcu_access_pointer(sdata->vif.chanctx_conf) != conf)

			continue;

		if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)

			continue;



		if (!compat)

			compat = &sdata->vif.bss_conf.chandef;

net/mac80211/debugfs_sta.c

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static ssize_t sta_agg_status_read(struct file *file, char __user *userbuf, 
	p += scnprintf(p, sizeof(buf) + buf - p, "next dialog_token: %#02x\n",

			sta->ampdu_mlme.dialog_token_allocator + 1);

	p += scnprintf(p, sizeof(buf) + buf - p,

		       "TID\t\tRX active\tDTKN\tSSN\t\tTX\tDTKN\tpending\n");

		       "TID\t\tRX\tDTKN\tSSN\t\tTX\tDTKN\tpending\n");



	for (i = 0; i < IEEE80211_NUM_TIDS; i++) {

		tid_rx = rcu_dereference(sta->ampdu_mlme.tid_rx[i]);

net/mac80211/iface.c

+2 −2
Original line number Diff line number Diff line
@@ -1175,8 +1175,8 @@ static void ieee80211_iface_work(struct work_struct *work) 
			if (sta) {

				u16 last_seq;



				last_seq = le16_to_cpu(

					sta->last_seq_ctrl[rx_agg->tid]);

				last_seq = IEEE80211_SEQ_TO_SN(le16_to_cpu(

					sta->last_seq_ctrl[rx_agg->tid]));



				__ieee80211_start_rx_ba_session(sta,

						0, 0,

net/mac80211/mesh_plink.c

+6 −1
Original line number Diff line number Diff line
@@ -959,7 +959,8 @@ mesh_plink_get_event(struct ieee80211_sub_if_data *sdata, 
		if (!matches_local)

			event = CNF_RJCT;

		if (!mesh_plink_free_count(sdata) ||

		    (sta->llid != llid || sta->plid != plid))

		    sta->llid != llid ||

		    (sta->plid && sta->plid != plid))

			event = CNF_IGNR;

		else

			event = CNF_ACPT;
@@ -1080,6 +1081,10 @@ mesh_process_plink_frame(struct ieee80211_sub_if_data *sdata, 
		goto unlock_rcu;

	}



	/* 802.11-2012 13.3.7.2 - update plid on CNF if not set */

	if (!sta->plid && event == CNF_ACPT)

		sta->plid = plid;



	changed |= mesh_plink_fsm(sdata, sta, event);



unlock_rcu:

CRA Git | Maintained and supported by SUSTech CRA and CCSE