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

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

Merge tag 'mac80211-next-for-davem-2016-07-06' of... 

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



Johannes Berg says:

====================
One more set of new features:
 * beacon report (for radio measurement) support in cfg80211/mac80211
 * hwsim: allow wmediumd in namespaces
 * mac80211: extend 160MHz workaround to CSA IEs
 * mesh: properly encrypt group-addressed privacy action frames
 * mesh: allow setting peer AID
 * first steps for MU-MIMO monitor mode
 * along with various other cleanups and improvements
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents fcf752ae 7d27a0ba

drivers/net/wireless/ath/ath10k/mac.c

+9 −5
Original line number Diff line number Diff line
@@ -3858,12 +3858,16 @@ void __ath10k_scan_finish(struct ath10k *ar) 
		break;

	case ATH10K_SCAN_RUNNING:

	case ATH10K_SCAN_ABORTING:

		if (!ar->scan.is_roc)

			ieee80211_scan_completed(ar->hw,

						 (ar->scan.state ==

						  ATH10K_SCAN_ABORTING));

		else if (ar->scan.roc_notify)

		if (!ar->scan.is_roc) {

			struct cfg80211_scan_info info = {

				.aborted = (ar->scan.state ==

					    ATH10K_SCAN_ABORTING),

			};



			ieee80211_scan_completed(ar->hw, &info);

		} else if (ar->scan.roc_notify) {

			ieee80211_remain_on_channel_expired(ar->hw);

		}

		/* fall through */

	case ATH10K_SCAN_STARTING:

		ar->scan.state = ATH10K_SCAN_IDLE;

drivers/net/wireless/ath/ath6kl/cfg80211.c

+14 −3
Original line number Diff line number Diff line
@@ -859,7 +859,11 @@ void ath6kl_cfg80211_disconnect_event(struct ath6kl_vif *vif, u8 reason, 
	struct ath6kl *ar = vif->ar;



	if (vif->scan_req) {

		cfg80211_scan_done(vif->scan_req, true);

		struct cfg80211_scan_info info = {

			.aborted = true,

		};



		cfg80211_scan_done(vif->scan_req, &info);

		vif->scan_req = NULL;

	}
@@ -1069,6 +1073,9 @@ static int ath6kl_cfg80211_scan(struct wiphy *wiphy, 
void ath6kl_cfg80211_scan_complete_event(struct ath6kl_vif *vif, bool aborted)

{

	struct ath6kl *ar = vif->ar;

	struct cfg80211_scan_info info = {

		.aborted = aborted,

	};

	int i;



	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: status%s\n", __func__,
@@ -1089,7 +1096,7 @@ void ath6kl_cfg80211_scan_complete_event(struct ath6kl_vif *vif, bool aborted) 
	}



out:

	cfg80211_scan_done(vif->scan_req, aborted);

	cfg80211_scan_done(vif->scan_req, &info);

	vif->scan_req = NULL;

}
@@ -3614,7 +3621,11 @@ void ath6kl_cfg80211_vif_stop(struct ath6kl_vif *vif, bool wmi_ready) 
	}



	if (vif->scan_req) {

		cfg80211_scan_done(vif->scan_req, true);

		struct cfg80211_scan_info info = {

			.aborted = true,

		};



		cfg80211_scan_done(vif->scan_req, &info);

		vif->scan_req = NULL;

	}

drivers/net/wireless/ath/ath9k/channel.c

+4 −1
Original line number Diff line number Diff line
@@ -960,6 +960,9 @@ void ath_roc_complete(struct ath_softc *sc, enum ath_roc_complete_reason reason) 
void ath_scan_complete(struct ath_softc *sc, bool abort)

{

	struct ath_common *common = ath9k_hw_common(sc->sc_ah);

	struct cfg80211_scan_info info = {

		.aborted = abort,

	};



	if (abort)

		ath_dbg(common, CHAN_CTX, "HW scan aborted\n");
@@ -969,7 +972,7 @@ void ath_scan_complete(struct ath_softc *sc, bool abort) 
	sc->offchannel.scan_req = NULL;

	sc->offchannel.scan_vif = NULL;

	sc->offchannel.state = ATH_OFFCHANNEL_IDLE;

	ieee80211_scan_completed(sc->hw, abort);

	ieee80211_scan_completed(sc->hw, &info);

	clear_bit(ATH_OP_SCANNING, &common->op_flags);

	spin_lock_bh(&sc->chan_lock);

	if (test_bit(ATH_OP_MULTI_CHANNEL, &common->op_flags))

drivers/net/wireless/ath/wil6210/cfg80211.c

+5 −1
Original line number Diff line number Diff line
@@ -1369,7 +1369,11 @@ static void wil_cfg80211_stop_p2p_device(struct wiphy *wiphy, 
	mutex_lock(&wil->mutex);

	started = wil_p2p_stop_discovery(wil);

	if (started && wil->scan_request) {

		cfg80211_scan_done(wil->scan_request, 1);

		struct cfg80211_scan_info info = {

			.aborted = true,

		};



		cfg80211_scan_done(wil->scan_request, &info);

		wil->scan_request = NULL;

		wil->radio_wdev = wil->wdev;

	}

drivers/net/wireless/ath/wil6210/main.c

+10 −2
Original line number Diff line number Diff line
@@ -850,10 +850,14 @@ int wil_reset(struct wil6210_priv *wil, bool load_fw) 
	mutex_unlock(&wil->wmi_mutex);



	if (wil->scan_request) {

		struct cfg80211_scan_info info = {

			.aborted = true,

		};



		wil_dbg_misc(wil, "Abort scan_request 0x%p\n",

			     wil->scan_request);

		del_timer_sync(&wil->scan_timer);

		cfg80211_scan_done(wil->scan_request, true);

		cfg80211_scan_done(wil->scan_request, &info);

		wil->scan_request = NULL;

	}
@@ -1049,10 +1053,14 @@ int __wil_down(struct wil6210_priv *wil) 
	(void)wil_p2p_stop_discovery(wil);



	if (wil->scan_request) {

		struct cfg80211_scan_info info = {

			.aborted = true,

		};



		wil_dbg_misc(wil, "Abort scan_request 0x%p\n",

			     wil->scan_request);

		del_timer_sync(&wil->scan_timer);

		cfg80211_scan_done(wil->scan_request, true);

		cfg80211_scan_done(wil->scan_request, &info);

		wil->scan_request = NULL;

	}