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

Commit 30d237a6 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-for-davem-2016-04-06' of... 

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



Johannes Berg says:

====================
For the current RC series, we have the following fixes:
 * TDLS fixes from Arik and Ilan
 * rhashtable fixes from Ben and myself
 * documentation fixes from Luis
 * U-APSD fixes from Emmanuel
 * a TXQ fix from Felix
 * and a compiler warning suppression from Jeff
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3430284f b4201cc4

include/net/mac80211.h

+2 −0
Original line number Diff line number Diff line
@@ -1001,6 +1001,8 @@ ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info) 
 *	flag indicates that the PN was verified for replay protection.

 *	Note that this flag is also currently only supported when a frame

 *	is also decrypted (ie. @RX_FLAG_DECRYPTED must be set)

 * @RX_FLAG_DUP_VALIDATED: The driver should set this flag if it did

 *	de-duplication by itself.

 * @RX_FLAG_FAILED_FCS_CRC: Set this flag if the FCS check failed on

 *	the frame.

 * @RX_FLAG_FAILED_PLCP_CRC: Set this flag if the PCLP check failed on

net/mac80211/chan.c

+3 −1
Original line number Diff line number Diff line
@@ -343,8 +343,10 @@ static void ieee80211_change_chanctx(struct ieee80211_local *local, 
				     struct ieee80211_chanctx *ctx,

				     const struct cfg80211_chan_def *chandef)

{

	if (cfg80211_chandef_identical(&ctx->conf.def, chandef))

	if (cfg80211_chandef_identical(&ctx->conf.def, chandef)) {

		ieee80211_recalc_chanctx_min_def(local, ctx);

		return;

	}



	WARN_ON(!cfg80211_chandef_compatible(&ctx->conf.def, chandef));

net/mac80211/ieee80211_i.h

+4 −0
Original line number Diff line number Diff line
@@ -1719,6 +1719,10 @@ ieee80211_vht_cap_ie_to_sta_vht_cap(struct ieee80211_sub_if_data *sdata, 
enum ieee80211_sta_rx_bandwidth ieee80211_sta_cap_rx_bw(struct sta_info *sta);

enum ieee80211_sta_rx_bandwidth ieee80211_sta_cur_vht_bw(struct sta_info *sta);

void ieee80211_sta_set_rx_nss(struct sta_info *sta);

enum ieee80211_sta_rx_bandwidth

ieee80211_chan_width_to_rx_bw(enum nl80211_chan_width width);

enum nl80211_chan_width ieee80211_sta_cap_chan_bw(struct sta_info *sta);

void ieee80211_sta_set_rx_nss(struct sta_info *sta);

void ieee80211_process_mu_groups(struct ieee80211_sub_if_data *sdata,

				 struct ieee80211_mgmt *mgmt);

u32 __ieee80211_vht_handle_opmode(struct ieee80211_sub_if_data *sdata,

net/mac80211/mesh_hwmp.c

+1 −1
Original line number Diff line number Diff line
@@ -530,7 +530,7 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata, 
	const u8 *target_addr, *orig_addr;

	const u8 *da;

	u8 target_flags, ttl, flags;

	u32 orig_sn, target_sn, lifetime, target_metric;

	u32 orig_sn, target_sn, lifetime, target_metric = 0;

	bool reply = false;

	bool forward = true;

	bool root_is_gate;

net/mac80211/sta_info.c

+9 −5
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 


static const struct rhashtable_params sta_rht_params = {

	.nelem_hint = 3, /* start small */

	.insecure_elasticity = true, /* Disable chain-length checks. */

	.automatic_shrinking = true,

	.head_offset = offsetof(struct sta_info, hash_node),

	.key_offset = offsetof(struct sta_info, addr),
@@ -258,10 +259,10 @@ void sta_info_free(struct ieee80211_local *local, struct sta_info *sta) 
}



/* Caller must hold local->sta_mtx */

static void sta_info_hash_add(struct ieee80211_local *local,

static int sta_info_hash_add(struct ieee80211_local *local,

			     struct sta_info *sta)

{

	rhashtable_insert_fast(&local->sta_hash, &sta->hash_node,

	return rhashtable_insert_fast(&local->sta_hash, &sta->hash_node,

				      sta_rht_params);

}
@@ -524,7 +525,9 @@ static int sta_info_insert_finish(struct sta_info *sta) __acquires(RCU) 
	set_sta_flag(sta, WLAN_STA_BLOCK_BA);



	/* make the station visible */

	sta_info_hash_add(local, sta);

	err = sta_info_hash_add(local, sta);

	if (err)

		goto out_drop_sta;



	list_add_tail_rcu(&sta->list, &local->sta_list);
@@ -557,6 +560,7 @@ static int sta_info_insert_finish(struct sta_info *sta) __acquires(RCU) 
 out_remove:

	sta_info_hash_del(local, sta);

	list_del_rcu(&sta->list);

 out_drop_sta:

	local->num_sta--;

	synchronize_net();

	__cleanup_single_sta(sta);