Commit 9fab4cc8 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git 

ath.git patches for v5.20. One fix and rest minor cleanup.
parents fa28981b ec65e0e9

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

+2 −1
Original line number Diff line number Diff line
@@ -1401,7 +1401,8 @@ void ath11k_mac_bcn_tx_event(struct ath11k_vif *arvif) 
	if (!vif->bss_conf.color_change_active && !arvif->bcca_zero_sent)

		return;



	if (vif->bss_conf.color_change_active && ieee80211_beacon_cntdwn_is_complete(vif)) {

	if (vif->bss_conf.color_change_active &&

	    ieee80211_beacon_cntdwn_is_complete(vif)) {

		arvif->bcca_zero_sent = true;

		ieee80211_color_change_finish(vif);

		return;

drivers/net/wireless/ath/ath5k/base.c

+1 −1
Original line number Diff line number Diff line
@@ -1982,7 +1982,7 @@ ath5k_beacon_send(struct ath5k_hw *ah) 


	/*

	 * Check if the previous beacon has gone out.  If

	 * not, don't don't try to post another: skip this

	 * not, don't try to post another: skip this

	 * period and wait for the next.  Missed beacons

	 * indicate a problem and should not occur.  If we

	 * miss too many consecutive beacons reset the device.

drivers/net/wireless/ath/ath5k/mac80211-ops.c

+1 −1
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ ath5k_configure_filter(struct ieee80211_hw *hw, unsigned int changed_flags, 
	/* FIF_CONTROL doc says we should only pass on control frames for this

	 * station. This needs testing. I believe right now this

	 * enables *all* control frames, which is OK.. but

	 * but we should see if we can improve on granularity */

	 * we should see if we can improve on granularity */

	if (*new_flags & FIF_CONTROL)

		rfilt |= AR5K_RX_FILTER_CONTROL;

drivers/net/wireless/ath/ath6kl/hif.h

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ struct bus_request { 
 *     emode - This indicates the whether the command is to be executed in a

 *             blocking or non-blocking fashion (HIF_SYNCHRONOUS/

 *             HIF_ASYNCHRONOUS). The read/write data paths in HTC have been

 *             implemented using the asynchronous mode allowing the the bus

 *             implemented using the asynchronous mode allowing the bus

 *             driver to indicate the completion of operation through the

 *             registered callback routine. The requirement primarily comes

 *             from the contexts these operations get called from (a driver's

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

+1 −1
Original line number Diff line number Diff line
@@ -1185,7 +1185,7 @@ static int ath6kl_sdio_bmi_read(struct ath6kl *ar, u8 *buf, u32 len) 
	 *        Wait for first 4 bytes to be in FIFO

	 *        If CONSERVATIVE_BMI_READ is enabled, also wait for

	 *        a BMI command credit, which indicates that the ENTIRE

	 *        response is available in the the FIFO

	 *        response is available in the FIFO

	 *

	 *  CASE 3: length > 128

	 *        Wait for the first 4 bytes to be in FIFO