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

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

Merge tag 'mac80211-for-davem-2019-02-12' of... 

Merge tag 'mac80211-for-davem-2019-02-12' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg says:

====================
Just a few fixes:
 * aggregation session teardown with internal TXQs was
   continuing to send some frames marked as aggregation,
   fix from Ilan
 * IBSS join was missed during firmware restart, should
   such a thing happen
 * speculative execution based on the return value of
   cfg80211_classify8021d() - which is controlled by the
   sender of the packet - could be problematic in some
   code using it, prevent it
 * a few peer measurement fixes
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 91986ee1 6157ca0d

net/mac80211/agg-tx.c

+3 −1
Original line number Diff line number Diff line
@@ -8,7 +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

 * Copyright (C) 2018 - 2019 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
@@ -366,6 +366,8 @@ int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid, 


	set_bit(HT_AGG_STATE_STOPPING, &tid_tx->state);



	ieee80211_agg_stop_txq(sta, tid);



	spin_unlock_bh(&sta->lock);



	ht_dbg(sta->sdata, "Tx BA session stop requested for %pM tid %u\n",

net/mac80211/util.c

+5 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 * Copyright 2007	Johannes Berg <johannes@sipsolutions.net>

 * Copyright 2013-2014  Intel Mobile Communications GmbH

 * Copyright (C) 2015-2017	Intel Deutschland GmbH

 * Copyright (C) 2018 Intel Corporation

 * Copyright (C) 2018-2019 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
@@ -2146,6 +2146,10 @@ int ieee80211_reconfig(struct ieee80211_local *local) 
		case NL80211_IFTYPE_AP_VLAN:

		case NL80211_IFTYPE_MONITOR:

			break;

		case NL80211_IFTYPE_ADHOC:

			if (sdata->vif.bss_conf.ibss_joined)

				WARN_ON(drv_join_ibss(local, sdata));

			/* fall through */

		default:

			ieee80211_reconfig_stations(sdata);

			/* fall through */

net/wireless/core.c

+2 −0
Original line number Diff line number Diff line
@@ -1068,6 +1068,8 @@ static void __cfg80211_unregister_wdev(struct wireless_dev *wdev, bool sync) 


	ASSERT_RTNL();



	flush_work(&wdev->pmsr_free_wk);



	nl80211_notify_iface(rdev, wdev, NL80211_CMD_DEL_INTERFACE);



	list_del_rcu(&wdev->list);

net/wireless/nl80211.c

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ nl80211_pmsr_ftm_req_attr_policy[NL80211_PMSR_FTM_REQ_ATTR_MAX + 1] = { 
	[NL80211_PMSR_FTM_REQ_ATTR_BURST_DURATION] =

		NLA_POLICY_MAX(NLA_U8, 15),

	[NL80211_PMSR_FTM_REQ_ATTR_FTMS_PER_BURST] =

		NLA_POLICY_MAX(NLA_U8, 15),

		NLA_POLICY_MAX(NLA_U8, 31),

	[NL80211_PMSR_FTM_REQ_ATTR_NUM_FTMR_RETRIES] = { .type = NLA_U8 },

	[NL80211_PMSR_FTM_REQ_ATTR_REQUEST_LCI] = { .type = NLA_FLAG },

	[NL80211_PMSR_FTM_REQ_ATTR_REQUEST_CIVICLOC] = { .type = NLA_FLAG },

net/wireless/pmsr.c

+17 −9
Original line number Diff line number Diff line
@@ -256,8 +256,7 @@ int nl80211_pmsr_start(struct sk_buff *skb, struct genl_info *info) 
		if (err)

			goto out_err;

	} else {

		memcpy(req->mac_addr, nla_data(info->attrs[NL80211_ATTR_MAC]),

		       ETH_ALEN);

		memcpy(req->mac_addr, wdev_address(wdev), ETH_ALEN);

		memset(req->mac_addr_mask, 0xff, ETH_ALEN);

	}
@@ -272,6 +271,7 @@ int nl80211_pmsr_start(struct sk_buff *skb, struct genl_info *info) 


	req->n_peers = count;

	req->cookie = cfg80211_assign_cookie(rdev);

	req->nl_portid = info->snd_portid;



	err = rdev_start_pmsr(rdev, wdev, req);

	if (err)
@@ -530,14 +530,14 @@ void cfg80211_pmsr_report(struct wireless_dev *wdev, 
}

EXPORT_SYMBOL_GPL(cfg80211_pmsr_report);



void cfg80211_pmsr_free_wk(struct work_struct *work)

static void cfg80211_pmsr_process_abort(struct wireless_dev *wdev)

{

	struct wireless_dev *wdev = container_of(work, struct wireless_dev,

						 pmsr_free_wk);

	struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);

	struct cfg80211_pmsr_request *req, *tmp;

	LIST_HEAD(free_list);



	lockdep_assert_held(&wdev->mtx);



	spin_lock_bh(&wdev->pmsr_lock);

	list_for_each_entry_safe(req, tmp, &wdev->pmsr_list, list) {

		if (req->nl_portid)
@@ -547,14 +547,22 @@ void cfg80211_pmsr_free_wk(struct work_struct *work) 
	spin_unlock_bh(&wdev->pmsr_lock);



	list_for_each_entry_safe(req, tmp, &free_list, list) {

		wdev_lock(wdev);

		rdev_abort_pmsr(rdev, wdev, req);

		wdev_unlock(wdev);



		kfree(req);

	}

}



void cfg80211_pmsr_free_wk(struct work_struct *work)

{

	struct wireless_dev *wdev = container_of(work, struct wireless_dev,

						 pmsr_free_wk);



	wdev_lock(wdev);

	cfg80211_pmsr_process_abort(wdev);

	wdev_unlock(wdev);

}



void cfg80211_pmsr_wdev_down(struct wireless_dev *wdev)

{

	struct cfg80211_pmsr_request *req;
@@ -568,8 +576,8 @@ void cfg80211_pmsr_wdev_down(struct wireless_dev *wdev) 
	spin_unlock_bh(&wdev->pmsr_lock);



	if (found)

		schedule_work(&wdev->pmsr_free_wk);

	flush_work(&wdev->pmsr_free_wk);

		cfg80211_pmsr_process_abort(wdev);



	WARN_ON(!list_empty(&wdev->pmsr_list));

}