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

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

Merge tag 'mac80211-next-for-davem-2017-04-28' of... 

Merge tag 'mac80211-next-for-davem-2017-04-28' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next



Johannes Berg says:

====================
Another set of patches for -next:
 * API support for concurrent scheduled scan requests
 * API changes for roaming reporting
 * BSS max idle support in mac80211
 * API changes for TX status reporting in mac80211
 * API changes for RX rate reporting in mac80211
 * rewrite monitor logic to prepare for BPF filters
 * bugfix for rare devices without 2.4 GHz support
 * a bugfix for recent DFS changes
 * some further cleanups

The API changes are actually at a nice time, since it's
typically quiet just before the merge window, and trees
can be synchronized easily during it.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2d2ab658 b34939b9

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

+22 −26
Original line number Diff line number Diff line
@@ -632,11 +632,11 @@ static void ath10k_htt_rx_h_rates(struct ath10k *ar, 
		sgi = (info3 >> 7) & 1;



		status->rate_idx = mcs;

		status->flag |= RX_FLAG_HT;

		status->encoding = RX_ENC_HT;

		if (sgi)

			status->flag |= RX_FLAG_SHORT_GI;

			status->enc_flags |= RX_ENC_FLAG_SHORT_GI;

		if (bw)

			status->flag |= RX_FLAG_40MHZ;

			status->bw = RATE_INFO_BW_40;

		break;

	case HTT_RX_VHT:

	case HTT_RX_VHT_WITH_TXBF:
@@ -689,10 +689,10 @@ static void ath10k_htt_rx_h_rates(struct ath10k *ar, 
		}



		status->rate_idx = mcs;

		status->vht_nss = nss;

		status->nss = nss;



		if (sgi)

			status->flag |= RX_FLAG_SHORT_GI;

			status->enc_flags |= RX_ENC_FLAG_SHORT_GI;



		switch (bw) {

		/* 20MHZ */
@@ -700,18 +700,18 @@ static void ath10k_htt_rx_h_rates(struct ath10k *ar, 
			break;

		/* 40MHZ */

		case 1:

			status->flag |= RX_FLAG_40MHZ;

			status->bw = RATE_INFO_BW_40;

			break;

		/* 80MHZ */

		case 2:

			status->vht_flag |= RX_VHT_FLAG_80MHZ;

			status->bw = RATE_INFO_BW_80;

			break;

		case 3:

			status->vht_flag |= RX_VHT_FLAG_160MHZ;

			status->bw = RATE_INFO_BW_160;

			break;

		}



		status->flag |= RX_FLAG_VHT;

		status->encoding = RX_ENC_VHT;

		break;

	default:

		break;
@@ -874,13 +874,10 @@ static void ath10k_htt_rx_h_ppdu(struct ath10k *ar, 
		/* New PPDU starts so clear out the old per-PPDU status. */

		status->freq = 0;

		status->rate_idx = 0;

		status->vht_nss = 0;

		status->vht_flag &= ~RX_VHT_FLAG_80MHZ;

		status->flag &= ~(RX_FLAG_HT |

				  RX_FLAG_VHT |

				  RX_FLAG_SHORT_GI |

				  RX_FLAG_40MHZ |

				  RX_FLAG_MACTIME_END);

		status->nss = 0;

		status->encoding = RX_ENC_LEGACY;

		status->bw = RATE_INFO_BW_20;

		status->flag &= ~RX_FLAG_MACTIME_END;

		status->flag |= RX_FLAG_NO_SIGNAL_VAL;



		ath10k_htt_rx_h_signal(ar, status, rxd);
@@ -933,7 +930,7 @@ static void ath10k_process_rx(struct ath10k *ar, 
	*status = *rx_status;



	ath10k_dbg(ar, ATH10K_DBG_DATA,

		   "rx skb %pK len %u peer %pM %s %s sn %u %s%s%s%s%s%s %srate_idx %u vht_nss %u freq %u band %u flag 0x%llx fcs-err %i mic-err %i amsdu-more %i\n",

		   "rx skb %pK len %u peer %pM %s %s sn %u %s%s%s%s%s%s %srate_idx %u vht_nss %u freq %u band %u flag 0x%x fcs-err %i mic-err %i amsdu-more %i\n",

		   skb,

		   skb->len,

		   ieee80211_get_SA(hdr),
@@ -941,16 +938,15 @@ static void ath10k_process_rx(struct ath10k *ar, 
		   is_multicast_ether_addr(ieee80211_get_DA(hdr)) ?

							"mcast" : "ucast",

		   (__le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_SEQ) >> 4,

		   (status->flag & (RX_FLAG_HT | RX_FLAG_VHT)) == 0 ?

							"legacy" : "",

		   status->flag & RX_FLAG_HT ? "ht" : "",

		   status->flag & RX_FLAG_VHT ? "vht" : "",

		   status->flag & RX_FLAG_40MHZ ? "40" : "",

		   status->vht_flag & RX_VHT_FLAG_80MHZ ? "80" : "",

		   status->vht_flag & RX_VHT_FLAG_160MHZ ? "160" : "",

		   status->flag & RX_FLAG_SHORT_GI ? "sgi " : "",

		   (status->encoding == RX_ENC_LEGACY) ? "legacy" : "",

		   (status->encoding == RX_ENC_HT) ? "ht" : "",

		   (status->encoding == RX_ENC_VHT) ? "vht" : "",

		   (status->bw == RATE_INFO_BW_40) ? "40" : "",

		   (status->bw == RATE_INFO_BW_80) ? "80" : "",

		   (status->bw == RATE_INFO_BW_160) ? "160" : "",

		   status->enc_flags & RX_ENC_FLAG_SHORT_GI ? "sgi " : "",

		   status->rate_idx,

		   status->vht_nss,

		   status->nss,

		   status->freq,

		   status->band, status->flag,

		   !!(status->flag & RX_FLAG_FAILED_FCS_CRC),

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

+3 −3
Original line number Diff line number Diff line
@@ -1414,10 +1414,10 @@ ath5k_receive_frame(struct ath5k_hw *ah, struct sk_buff *skb, 
	rxs->flag |= ath5k_rx_decrypted(ah, skb, rs);

	switch (ah->ah_bwmode) {

	case AR5K_BWMODE_5MHZ:

		rxs->flag |= RX_FLAG_5MHZ;

		rxs->bw = RATE_INFO_BW_5;

		break;

	case AR5K_BWMODE_10MHZ:

		rxs->flag |= RX_FLAG_10MHZ;

		rxs->bw = RATE_INFO_BW_10;

		break;

	default:

		break;
@@ -1425,7 +1425,7 @@ ath5k_receive_frame(struct ath5k_hw *ah, struct sk_buff *skb, 


	if (rs->rs_rate ==

	    ah->sbands[ah->curchan->band].bitrates[rxs->rate_idx].hw_value_short)

		rxs->flag |= RX_FLAG_SHORTPRE;

		rxs->enc_flags |= RX_ENC_FLAG_SHORTPRE;



	trace_ath5k_rx(ah, skb);

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

+11 −5
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static void ath6kl_cfg80211_sscan_disable(struct ath6kl_vif *vif) 
	if (!stopped)

		return;



	cfg80211_sched_scan_stopped(ar->wiphy);

	cfg80211_sched_scan_stopped(ar->wiphy, 0);

}



static int ath6kl_set_wpa_version(struct ath6kl_vif *vif,
@@ -806,9 +806,15 @@ void ath6kl_cfg80211_connect_event(struct ath6kl_vif *vif, u16 channel, 
					WLAN_STATUS_SUCCESS, GFP_KERNEL);

		cfg80211_put_bss(ar->wiphy, bss);

	} else if (vif->sme_state == SME_CONNECTED) {

		struct cfg80211_roam_info roam_info = {

			.bss = bss,

			.req_ie = assoc_req_ie,

			.req_ie_len = assoc_req_len,

			.resp_ie = assoc_resp_ie,

			.resp_ie_len = assoc_resp_len,

		};

		/* inform roam event to cfg80211 */

		cfg80211_roamed_bss(vif->ndev, bss, assoc_req_ie, assoc_req_len,

				    assoc_resp_ie, assoc_resp_len, GFP_KERNEL);

		cfg80211_roamed(vif->ndev, &roam_info, GFP_KERNEL);

	}

}
@@ -3352,7 +3358,7 @@ static int ath6kl_cfg80211_sscan_start(struct wiphy *wiphy, 
}



static int ath6kl_cfg80211_sscan_stop(struct wiphy *wiphy,

				      struct net_device *dev)

				      struct net_device *dev, u64 reqid)

{

	struct ath6kl_vif *vif = netdev_priv(dev);

	bool stopped;
@@ -3973,7 +3979,7 @@ int ath6kl_cfg80211_init(struct ath6kl *ar) 
			    WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD;



	if (test_bit(ATH6KL_FW_CAPABILITY_SCHED_SCAN_V2, ar->fw_capabilities))

		ar->wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;

		ar->wiphy->max_sched_scan_reqs = 1;



	if (test_bit(ATH6KL_FW_CAPABILITY_INACTIVITY_TIMEOUT,

		     ar->fw_capabilities))

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

+1 −1
Original line number Diff line number Diff line
@@ -1082,7 +1082,7 @@ void ath6kl_wmi_sscan_timer(unsigned long ptr) 
{

	struct ath6kl_vif *vif = (struct ath6kl_vif *) ptr;



	cfg80211_sched_scan_results(vif->ar->wiphy);

	cfg80211_sched_scan_results(vif->ar->wiphy, 0);

}



static int ath6kl_wmi_bssinfo_event_rx(struct wmi *wmi, u8 *datap, int len,

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

+4 −3
Original line number Diff line number Diff line
@@ -494,7 +494,8 @@ int ath9k_hw_process_rxdesc_edma(struct ath_hw *ah, struct ath_rx_status *rxs, 


	rxs->rs_status = 0;

	rxs->rs_flags =  0;

	rxs->flag =  0;

	rxs->enc_flags = 0;

	rxs->bw = RATE_INFO_BW_20;



	rxs->rs_datalen = rxsp->status2 & AR_DataLen;

	rxs->rs_tstamp =  rxsp->status3;
@@ -520,8 +521,8 @@ int ath9k_hw_process_rxdesc_edma(struct ath_hw *ah, struct ath_rx_status *rxs, 
	rxs->rs_isaggr = (rxsp->status11 & AR_RxAggr) ? 1 : 0;

	rxs->rs_moreaggr = (rxsp->status11 & AR_RxMoreAggr) ? 1 : 0;

	rxs->rs_antenna = (MS(rxsp->status4, AR_RxAntenna) & 0x7);

	rxs->flag  |= (rxsp->status4 & AR_GI) ? RX_FLAG_SHORT_GI : 0;

	rxs->flag  |= (rxsp->status4 & AR_2040) ? RX_FLAG_40MHZ : 0;

	rxs->enc_flags |= (rxsp->status4 & AR_GI) ? RX_ENC_FLAG_SHORT_GI : 0;

	rxs->enc_flags |= (rxsp->status4 & AR_2040) ? RX_ENC_FLAG_40MHZ : 0;



	rxs->evm0 = rxsp->status6;

	rxs->evm1 = rxsp->status7;