Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next (841577c3) · Commits · 戴 / test

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -204,7 +204,7 @@ static void process_rx_rates(struct ath10k ar, struct htt_rx_info info,
		break;
		/* 80MHZ */
		case 2:
		status->flag \|= RX_FLAG_80MHZ;
		status->vht_flag \|= RX_VHT_FLAG_80MHZ;
		}

		status->flag \|= RX_FLAG_VHT;
		@@ -266,7 +266,7 @@ void ath10k_process_rx(struct ath10k ar, struct htt_rx_info info)
		status->flag & RX_FLAG_HT ? "ht" : "",
		status->flag & RX_FLAG_VHT ? "vht" : "",
		status->flag & RX_FLAG_40MHZ ? "40" : "",
		status->flag & RX_FLAG_80MHZ ? "80" : "",
		status->vht_flag & RX_VHT_FLAG_80MHZ ? "80" : "",
		status->flag & RX_FLAG_SHORT_GI ? "sgi " : "",
		status->rate_idx,
		status->vht_nss,

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

+16 −11

Original line number	Diff line number	Diff line
		@@ -790,7 +790,7 @@ void ath6kl_cfg80211_connect_event(struct ath6kl_vif *vif, u16 channel,
		if (nw_type & ADHOC_NETWORK) {
		ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "ad-hoc %s selected\n",
		nw_type & ADHOC_CREATOR ? "creator" : "joiner");
		cfg80211_ibss_joined(vif->ndev, bssid, GFP_KERNEL);
		cfg80211_ibss_joined(vif->ndev, bssid, chan, GFP_KERNEL);
		cfg80211_put_bss(ar->wiphy, bss);
		return;
		}
		@@ -861,15 +861,11 @@ void ath6kl_cfg80211_disconnect_event(struct ath6kl_vif *vif, u8 reason,
		}

		if (vif->nw_type & ADHOC_NETWORK) {
		if (vif->wdev.iftype != NL80211_IFTYPE_ADHOC) {
		if (vif->wdev.iftype != NL80211_IFTYPE_ADHOC)
		ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,
		"%s: ath6k not in ibss mode\n", __func__);
		return;
		}
		memset(bssid, 0, ETH_ALEN);
		cfg80211_ibss_joined(vif->ndev, bssid, GFP_KERNEL);
		return;
		}

		if (vif->nw_type & INFRA_NETWORK) {
		if (vif->wdev.iftype != NL80211_IFTYPE_STATION &&
		@@ -3256,6 +3252,15 @@ static int ath6kl_cfg80211_sscan_start(struct wiphy *wiphy,
		struct ath6kl_vif *vif = netdev_priv(dev);
		u16 interval;
		int ret, rssi_thold;
		int n_match_sets = request->n_match_sets;

		/*
		* If there's a matchset w/o an SSID, then assume it's just for
		* the RSSI (nothing else is currently supported) and ignore it.
		* The device only supports a global RSSI filter that we set below.
		*/
		if (n_match_sets == 1 && !request->match_sets[0].ssid.ssid_len)
		n_match_sets = 0;

		if (ar->state != ATH6KL_STATE_ON)
		return -EIO;
		@@ -3268,11 +3273,11 @@ static int ath6kl_cfg80211_sscan_start(struct wiphy *wiphy,
		ret = ath6kl_set_probed_ssids(ar, vif, request->ssids,
		request->n_ssids,
		request->match_sets,
		request->n_match_sets);
		n_match_sets);
		if (ret < 0)
		return ret;

		if (!request->n_match_sets) {
		if (!n_match_sets) {
		ret = ath6kl_wmi_bssfilter_cmd(ar->wmi, vif->fw_vif_idx,
		ALL_BSS_FILTER, 0);
		if (ret < 0)
		@@ -3286,12 +3291,12 @@ static int ath6kl_cfg80211_sscan_start(struct wiphy *wiphy,

		if (test_bit(ATH6KL_FW_CAPABILITY_RSSI_SCAN_THOLD,
		ar->fw_capabilities)) {
		if (request->rssi_thold <= NL80211_SCAN_RSSI_THOLD_OFF)
		if (request->min_rssi_thold <= NL80211_SCAN_RSSI_THOLD_OFF)
		rssi_thold = 0;
		else if (request->rssi_thold < -127)
		else if (request->min_rssi_thold < -127)
		rssi_thold = -127;
		else
		rssi_thold = request->rssi_thold;
		rssi_thold = request->min_rssi_thold;

		ret = ath6kl_wmi_set_rssi_filter_cmd(ar->wmi, vif->fw_vif_idx,
		rssi_thold);

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -1466,8 +1466,7 @@ static void ath_rate_free_sta(void priv, struct ieee80211_sta sta,
		kfree(rate_priv);
		}

		static struct rate_control_ops ath_rate_ops = {
		.module = NULL,
		static const struct rate_control_ops ath_rate_ops = {
		.name = "ath9k_rate_control",
		.tx_status = ath_tx_status,
		.get_rate = ath_get_rate,

drivers/net/wireless/ath/wcn36xx/txrx.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -57,8 +57,7 @@ int wcn36xx_rx_skb(struct wcn36xx wcn, struct sk_buff skb)
		RX_FLAG_MMIC_STRIPPED \|
		RX_FLAG_DECRYPTED;

		wcn36xx_dbg(WCN36XX_DBG_RX, "status.flags=%x status->vendor_radiotap_len=%x\n",
		status.flag, status.vendor_radiotap_len);
		wcn36xx_dbg(WCN36XX_DBG_RX, "status.flags=%x\n", status.flag);

		memcpy(IEEE80211_SKB_RXCB(skb), &status, sizeof(status));

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -124,7 +124,8 @@ brcmf_fil_cmd_int_get(struct brcmf_if ifp, u32 cmd, u32 data)
		}

		static u32
		brcmf_create_iovar(char name, char data, u32 datalen, char *buf, u32 buflen)
		brcmf_create_iovar(char name, const char data, u32 datalen,
		char *buf, u32 buflen)
		{
		u32 len;

		@@ -144,7 +145,7 @@ brcmf_create_iovar(char name, char data, u32 datalen, char *buf, u32 buflen)


		s32
		brcmf_fil_iovar_data_set(struct brcmf_if ifp, char name, void *data,
		brcmf_fil_iovar_data_set(struct brcmf_if ifp, char name, const void *data,
		u32 len)
		{
		struct brcmf_pub *drvr = ifp->drvr;

Admin message