Merge branch 'master' of... (88daf80d) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/net/wireless/ath/ath.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -161,6 +161,8 @@ struct ath_common {
		bool btcoex_enabled;
		bool disable_ani;
		bool bt_ant_diversity;

		int last_rssi;
		};

		struct sk_buff ath_rxbuf_alloc(struct ath_common common,

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/Kconfig

+0 −12

Original line number	Diff line number	Diff line
		@@ -120,18 +120,6 @@ config ATH9K_WOW
		This option enables Wake on Wireless LAN support for certain cards.
		Currently, AR9462 is supported.

		config ATH9K_LEGACY_RATE_CONTROL
		bool "Atheros ath9k rate control"
		depends on ATH9K
		default n
		---help---
		Say Y, if you want to use the ath9k specific rate control
		module instead of minstrel_ht. Be warned that there are various
		issues with the ath9k RC and minstrel is a more robust algorithm.
		Note that even if this option is selected, "ath9k_rate_control"
		has to be passed to mac80211 using the module parameter,
		ieee80211_default_rc_algo.

		config ATH9K_RFKILL
		bool "Atheros ath9k rfkill support" if EXPERT
		depends on ATH9K

drivers/net/wireless/ath/ath9k/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,6 @@ ath9k-y += beacon.o \
		antenna.o

		ath9k-$(CONFIG_ATH9K_BTCOEX_SUPPORT) += mci.o
		ath9k-$(CONFIG_ATH9K_LEGACY_RATE_CONTROL) += rc.o
		ath9k-$(CONFIG_ATH9K_PCI) += pci.o
		ath9k-$(CONFIG_ATH9K_AHB) += ahb.o
		ath9k-$(CONFIG_ATH9K_DFS_DEBUGFS) += dfs_debug.o