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

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

Merge tag 'mac80211-for-davem-2018-05-09' of... 

Merge tag 'mac80211-for-davem-2018-05-09' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg says:

====================
We only have a few fixes this time:
 * WMM element validation
 * SAE timeout
 * add-BA timeout
 * docbook parsing
 * a few memory leaks in error paths
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 09c8b971 914eac24

drivers/net/wireless/mac80211_hwsim.c

+1 −0
Original line number Diff line number Diff line
@@ -3236,6 +3236,7 @@ static int hwsim_new_radio_nl(struct sk_buff *msg, struct genl_info *info) 
			GENL_SET_ERR_MSG(info,"MAC is no valid source addr");

			NL_SET_BAD_ATTR(info->extack,

					info->attrs[HWSIM_ATTR_PERM_ADDR]);

			kfree(hwname);

			return -EINVAL;

		}

include/net/mac80211.h

+1 −1
Original line number Diff line number Diff line
@@ -2080,7 +2080,7 @@ struct ieee80211_txq { 
 *	virtual interface might not be given air time for the transmission of

 *	the frame, as it is not synced with the AP/P2P GO yet, and thus the

 *	deauthentication frame might not be transmitted.

 >

 *

 * @IEEE80211_HW_DOESNT_SUPPORT_QOS_NDP: The driver (or firmware) doesn't

 *	support QoS NDP for AP probing - that's most likely a driver bug.

 *

include/uapi/linux/nl80211.h

+2 −0
Original line number Diff line number Diff line
@@ -2698,6 +2698,8 @@ enum nl80211_attrs { 
#define NL80211_ATTR_KEYS NL80211_ATTR_KEYS

#define NL80211_ATTR_FEATURE_FLAGS NL80211_ATTR_FEATURE_FLAGS



#define NL80211_WIPHY_NAME_MAXLEN		128



#define NL80211_MAX_SUPP_RATES			32

#define NL80211_MAX_SUPP_HT_RATES		77

#define NL80211_MAX_SUPP_REG_RULES		64

net/mac80211/agg-tx.c

+4 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * Copyright 2007, Michael Wu <flamingice@sourmilk.net>

 * Copyright 2007-2010, Intel Corporation

 * Copyright(c) 2015-2017 Intel Deutschland GmbH

 * Copyright (C) 2018 Intel Corporation

 *

 * 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
@@ -970,6 +971,9 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local, 


		sta->ampdu_mlme.addba_req_num[tid] = 0;



		tid_tx->timeout =

			le16_to_cpu(mgmt->u.action.u.addba_resp.timeout);



		if (tid_tx->timeout) {

			mod_timer(&tid_tx->session_timer,

				  TU_TO_EXP_TIME(tid_tx->timeout));

net/mac80211/mlme.c

+19 −8
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#define IEEE80211_AUTH_TIMEOUT		(HZ / 5)

#define IEEE80211_AUTH_TIMEOUT_LONG	(HZ / 2)

#define IEEE80211_AUTH_TIMEOUT_SHORT	(HZ / 10)

#define IEEE80211_AUTH_TIMEOUT_SAE	(HZ * 2)

#define IEEE80211_AUTH_MAX_TRIES	3

#define IEEE80211_AUTH_WAIT_ASSOC	(HZ * 5)

#define IEEE80211_ASSOC_TIMEOUT		(HZ / 5)
@@ -1787,7 +1788,7 @@ static bool ieee80211_sta_wmm_params(struct ieee80211_local *local, 
		params[ac].acm = acm;

		params[ac].uapsd = uapsd;



		if (params->cw_min == 0 ||

		if (params[ac].cw_min == 0 ||

		    params[ac].cw_min > params[ac].cw_max) {

			sdata_info(sdata,

				   "AP has invalid WMM params (CWmin/max=%d/%d for ACI %d), using defaults\n",
@@ -3814,15 +3815,18 @@ static int ieee80211_auth(struct ieee80211_sub_if_data *sdata) 
			    tx_flags);



	if (tx_flags == 0) {

		if (auth_data->algorithm == WLAN_AUTH_SAE)

			auth_data->timeout = jiffies +

				IEEE80211_AUTH_TIMEOUT_SAE;

		else

			auth_data->timeout = jiffies + IEEE80211_AUTH_TIMEOUT;

		auth_data->timeout_started = true;

		run_again(sdata, auth_data->timeout);

	} else {

		auth_data->timeout =

			round_jiffies_up(jiffies + IEEE80211_AUTH_TIMEOUT_LONG);

	}



	auth_data->timeout_started = true;

	run_again(sdata, auth_data->timeout);

	}



	return 0;

}
@@ -3894,8 +3898,15 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata) 
		ifmgd->status_received = false;

		if (ifmgd->auth_data && ieee80211_is_auth(fc)) {

			if (status_acked) {

				if (ifmgd->auth_data->algorithm ==

				    WLAN_AUTH_SAE)

					ifmgd->auth_data->timeout =

						jiffies +

						IEEE80211_AUTH_TIMEOUT_SAE;

				else

					ifmgd->auth_data->timeout =

					jiffies + IEEE80211_AUTH_TIMEOUT_SHORT;

						jiffies +

						IEEE80211_AUTH_TIMEOUT_SHORT;

				run_again(sdata, ifmgd->auth_data->timeout);

			} else {

				ifmgd->auth_data->timeout = jiffies - 1;