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

Commit 1a717fcf authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-for-davem-2017-01-13' of... 

Merge tag 'mac80211-for-davem-2017-01-13' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg says:

====================
We have a number of fixes, in part because I was late
in actually sending them out - will try to do better in
the future:
 * handle VHT opmode properly when hostapd is controlling
   full station state
 * two fixes for minimum channel width in mac80211
 * don't leave SMPS set to junk in HT capabilities
 * fix headroom when forwarding mesh packets, recently
   broken by another fix that failed to take into account
   frame encryption
 * fix the TID in null-data packets indicating EOSP (end
   of service period) in U-APSD
 * prevent attempting to use (and then failing which
   results in crashes) TXQs on stations that aren't added
   to the driver yet
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 75f01a4c dbef5362

include/uapi/linux/nl80211.h

+3 −1
Original line number Diff line number Diff line
@@ -1772,7 +1772,9 @@ enum nl80211_commands { 
 *

 * @NL80211_ATTR_OPMODE_NOTIF: Operating mode field from Operating Mode

 *	Notification Element based on association request when used with

 *	%NL80211_CMD_NEW_STATION; u8 attribute.

 *	%NL80211_CMD_NEW_STATION or %NL80211_CMD_SET_STATION (only when

 *	%NL80211_FEATURE_FULL_AP_CLIENT_STATE is supported, or with TDLS);

 *	u8 attribute.

 *

 * @NL80211_ATTR_VENDOR_ID: The vendor ID, either a 24-bit OUI or, if

 *	%NL80211_VENDOR_ID_IS_LINUX is set, a special Linux ID (not used yet)

net/mac80211/chan.c

+0 −3
Original line number Diff line number Diff line
@@ -231,9 +231,6 @@ ieee80211_get_max_required_bw(struct ieee80211_sub_if_data *sdata) 
		    !(sta->sdata->bss && sta->sdata->bss == sdata->bss))

			continue;



		if (!sta->uploaded || !test_sta_flag(sta, WLAN_STA_ASSOC))

			continue;



		max_bw = max(max_bw, ieee80211_get_sta_bw(&sta->sta));

	}

	rcu_read_unlock();

net/mac80211/iface.c

+21 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 * Copyright (c) 2006 Jiri Benc <jbenc@suse.cz>

 * Copyright 2008, Johannes Berg <johannes@sipsolutions.net>

 * Copyright 2013-2014  Intel Mobile Communications GmbH

 * Copyright (c) 2016        Intel Deutschland GmbH

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as
@@ -1295,6 +1296,26 @@ static void ieee80211_iface_work(struct work_struct *work) 
		} else if (ieee80211_is_action(mgmt->frame_control) &&

			   mgmt->u.action.category == WLAN_CATEGORY_VHT) {

			switch (mgmt->u.action.u.vht_group_notif.action_code) {

			case WLAN_VHT_ACTION_OPMODE_NOTIF: {

				struct ieee80211_rx_status *status;

				enum nl80211_band band;

				u8 opmode;



				status = IEEE80211_SKB_RXCB(skb);

				band = status->band;

				opmode = mgmt->u.action.u.vht_opmode_notif.operating_mode;



				mutex_lock(&local->sta_mtx);

				sta = sta_info_get_bss(sdata, mgmt->sa);



				if (sta)

					ieee80211_vht_handle_opmode(sdata, sta,

								    opmode,

								    band);



				mutex_unlock(&local->sta_mtx);

				break;

			}

			case WLAN_VHT_ACTION_GROUPID_MGMT:

				ieee80211_process_mu_groups(sdata, mgmt);

				break;

net/mac80211/main.c

+9 −4
Original line number Diff line number Diff line
@@ -913,12 +913,17 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) 
		supp_ht = supp_ht || sband->ht_cap.ht_supported;

		supp_vht = supp_vht || sband->vht_cap.vht_supported;



		if (sband->ht_cap.ht_supported)

		if (!sband->ht_cap.ht_supported)

			continue;



		/* TODO: consider VHT for RX chains, hopefully it's the same */

		local->rx_chains =

			max(ieee80211_mcs_to_chains(&sband->ht_cap.mcs),

			    local->rx_chains);



		/* TODO: consider VHT for RX chains, hopefully it's the same */

		/* no need to mask, SM_PS_DISABLED has all bits set */

		sband->ht_cap.cap |= WLAN_HT_CAP_SM_PS_DISABLED <<

			             IEEE80211_HT_CAP_SM_PS_SHIFT;

	}



	/* if low-level driver supports AP, we also support VLAN */

net/mac80211/rate.c

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ void rate_control_rate_init(struct sta_info *sta) 


	ieee80211_sta_set_rx_nss(sta);



	ieee80211_recalc_min_chandef(sta->sdata);



	if (!ref)

		return;