Commit 025a58fd authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
parents e84d2f8d faf1dc64

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

+4 −1
Original line number Diff line number Diff line
@@ -95,8 +95,10 @@ static void ath9k_htc_vif_iter(void *data, u8 *mac, struct ieee80211_vif *vif) 


	if ((vif->type == NL80211_IFTYPE_AP ||

	     vif->type == NL80211_IFTYPE_MESH_POINT) &&

	    bss_conf->enable_beacon)

	    bss_conf->enable_beacon) {

		priv->reconfig_beacon = true;

		priv->rearm_ani = true;

	}



	if (bss_conf->assoc) {

		priv->rearm_ani = true;
@@ -257,6 +259,7 @@ static int ath9k_htc_set_channel(struct ath9k_htc_priv *priv, 


	ath9k_htc_ps_wakeup(priv);



	ath9k_htc_stop_ani(priv);

	del_timer_sync(&priv->tx.cleanup_timer);

	ath9k_htc_tx_drain(priv);

drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c

+1 −1
Original line number Diff line number Diff line
@@ -4948,7 +4948,7 @@ static int brcmf_enable_bw40_2g(struct brcmf_if *ifp) 
	if (!err) {

		/* only set 2G bandwidth using bw_cap command */

		band_bwcap.band = cpu_to_le32(WLC_BAND_2G);

		band_bwcap.bw_cap = cpu_to_le32(WLC_BW_40MHZ_BIT);

		band_bwcap.bw_cap = cpu_to_le32(WLC_BW_CAP_40MHZ);

		err = brcmf_fil_iovar_data_set(ifp, "bw_cap", &band_bwcap,

					       sizeof(band_bwcap));

	} else {

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

+3 −3
Original line number Diff line number Diff line
@@ -611,14 +611,14 @@ int iwl_send_bt_init_conf(struct iwl_mvm *mvm) 
		bt_cmd->flags |= cpu_to_le32(BT_COEX_SYNC2SCO);



	if (IWL_MVM_BT_COEX_CORUNNING) {

		bt_cmd->valid_bit_msk = cpu_to_le32(BT_VALID_CORUN_LUT_20 |

		bt_cmd->valid_bit_msk |= cpu_to_le32(BT_VALID_CORUN_LUT_20 |

						     BT_VALID_CORUN_LUT_40);

		bt_cmd->flags |= cpu_to_le32(BT_COEX_CORUNNING);

	}



	if (IWL_MVM_BT_COEX_MPLUT) {

		bt_cmd->flags |= cpu_to_le32(BT_COEX_MPLUT);

		bt_cmd->valid_bit_msk = cpu_to_le32(BT_VALID_MULTI_PRIO_LUT);

		bt_cmd->valid_bit_msk |= cpu_to_le32(BT_VALID_MULTI_PRIO_LUT);

	}



	if (mvm->cfg->bt_shared_single_ant)

drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h

+4 −4
Original line number Diff line number Diff line
@@ -183,9 +183,9 @@ enum iwl_scan_type { 
 *	this number of packets were received (typically 1)

 * @passive2active: is auto switching from passive to active during scan allowed

 * @rxchain_sel_flags: RXON_RX_CHAIN_*

 * @max_out_time: in usecs, max out of serving channel time

 * @max_out_time: in TUs, max out of serving channel time

 * @suspend_time: how long to pause scan when returning to service channel:

 *	bits 0-19: beacon interal in usecs (suspend before executing)

 *	bits 0-19: beacon interal in TUs (suspend before executing)

 *	bits 20-23: reserved

 *	bits 24-31: number of beacons (suspend between channels)

 * @rxon_flags: RXON_FLG_*
@@ -383,8 +383,8 @@ enum scan_framework_client { 
 * @quiet_plcp_th:	quiet channel num of packets threshold

 * @good_CRC_th:	passive to active promotion threshold

 * @rx_chain:		RXON rx chain.

 * @max_out_time:	max uSec to be out of assoceated channel

 * @suspend_time:	pause scan this long when returning to service channel

 * @max_out_time:	max TUs to be out of assoceated channel

 * @suspend_time:	pause scan this TUs when returning to service channel

 * @flags:		RXON flags

 * @filter_flags:	RXONfilter

 * @tx_cmd:		tx command for active scan; for 2GHz and for 5GHz.

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

+7 −2
Original line number Diff line number Diff line
@@ -1007,7 +1007,7 @@ static void iwl_mvm_mc_iface_iterator(void *_data, u8 *mac, 
	memcpy(cmd->bssid, vif->bss_conf.bssid, ETH_ALEN);

	len = roundup(sizeof(*cmd) + cmd->count * ETH_ALEN, 4);



	ret = iwl_mvm_send_cmd_pdu(mvm, MCAST_FILTER_CMD, CMD_SYNC, len, cmd);

	ret = iwl_mvm_send_cmd_pdu(mvm, MCAST_FILTER_CMD, CMD_ASYNC, len, cmd);

	if (ret)

		IWL_ERR(mvm, "mcast filter cmd error. ret=%d\n", ret);

}
@@ -1023,7 +1023,7 @@ static void iwl_mvm_recalc_multicast(struct iwl_mvm *mvm) 
	if (WARN_ON_ONCE(!mvm->mcast_filter_cmd))

		return;



	ieee80211_iterate_active_interfaces(

	ieee80211_iterate_active_interfaces_atomic(

		mvm->hw, IEEE80211_IFACE_ITER_NORMAL,

		iwl_mvm_mc_iface_iterator, &iter_data);

}
@@ -1807,6 +1807,11 @@ static int iwl_mvm_mac_sched_scan_start(struct ieee80211_hw *hw, 


	mutex_lock(&mvm->mutex);



	if (!iwl_mvm_is_idle(mvm)) {

		ret = -EBUSY;

		goto out;

	}



	switch (mvm->scan_status) {

	case IWL_MVM_SCAN_OS:

		IWL_DEBUG_SCAN(mvm, "Stopping previous scan for sched_scan\n");