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

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

Merge tag 'mac80211-next-for-davem-2015-10-21' of... 

Merge tag 'mac80211-next-for-davem-2015-10-21' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next



Johannes Berg says:

====================
Here's another set of patches for the current cycle:
 * I merged net-next back to avoid a conflict with the
 * cfg80211 scheduled scan API extensions
 * preparations for better scan result timestamping
 * regulatory cleanups
 * mac80211 statistics cleanups
 * a few other small cleanups and fixes
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c7fc9eb7 e5a9f8d0

Documentation/DocBook/80211.tmpl

+3 −2
Original line number Diff line number Diff line
@@ -154,8 +154,9 @@ 
!Finclude/net/cfg80211.h cfg80211_scan_request

!Finclude/net/cfg80211.h cfg80211_scan_done

!Finclude/net/cfg80211.h cfg80211_bss

!Finclude/net/cfg80211.h cfg80211_inform_bss_width_frame

!Finclude/net/cfg80211.h cfg80211_inform_bss_width

!Finclude/net/cfg80211.h cfg80211_inform_bss

!Finclude/net/cfg80211.h cfg80211_inform_bss_frame_data

!Finclude/net/cfg80211.h cfg80211_inform_bss_data

!Finclude/net/cfg80211.h cfg80211_unlink_bss

!Finclude/net/cfg80211.h cfg80211_find_ie

!Finclude/net/cfg80211.h ieee80211_bss_get_ie

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

+1 −1
Original line number Diff line number Diff line
@@ -3312,7 +3312,7 @@ static int ath6kl_cfg80211_sscan_start(struct wiphy *wiphy, 
	}



	/* fw uses seconds, also make sure that it's >0 */

	interval = max_t(u16, 1, request->interval / 1000);

	interval = max_t(u16, 1, request->scan_plans[0].interval);



	ath6kl_wmi_scanparams_cmd(ar->wmi, vif->fw_vif_idx,

				  interval, interval,

drivers/net/wireless/iwlwifi/mvm/ops.c

+1 −0
Original line number Diff line number Diff line
@@ -630,6 +630,7 @@ static void iwl_op_mode_mvm_stop(struct iwl_op_mode *op_mode) 
	kfree(mvm->d3_resume_sram);

	if (mvm->nd_config) {

		kfree(mvm->nd_config->match_sets);

		kfree(mvm->nd_config->scan_plans);

		kfree(mvm->nd_config);

		mvm->nd_config = NULL;

	}

drivers/net/wireless/iwlwifi/mvm/scan.c

+2 −2
Original line number Diff line number Diff line
@@ -1271,12 +1271,12 @@ int iwl_mvm_sched_scan_start(struct iwl_mvm *mvm, 


	params.type = iwl_mvm_get_scan_type(mvm, vif, &params);



	if (req->interval > U16_MAX) {

	if (req->scan_plans[0].interval > U16_MAX) {

		IWL_DEBUG_SCAN(mvm,

			       "interval value is > 16-bits, set to max possible\n");

		params.interval = U16_MAX;

	} else {

		params.interval = req->interval / MSEC_PER_SEC;

		params.interval = req->scan_plans[0].interval;

	}



	/* In theory, LMAC scans can handle a 32-bit delay, but since

drivers/net/wireless/rt2x00/rt2x00config.c

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ void rt2x00lib_config(struct rt2x00_dev *rt2x00dev, 
		if (beacon_diff > beacon_int)

			beacon_diff = 0;



		autowake_timeout = (conf->max_sleep_period * beacon_int) - beacon_diff;

		autowake_timeout = (conf->ps_dtim_period * beacon_int) - beacon_diff;

		queue_delayed_work(rt2x00dev->workqueue,

				   &rt2x00dev->autowakeup_work,

				   autowake_timeout - 15);