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

Commit 593463ff 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 4.8. Major changes:

ath9k

* implement temperature compensation support for AR9003+

ath10k

* disable wake_tx_queue() mac80211 op for older devices to workaround
  throughput regression
parents 944c07a7 171f6402

drivers/net/wireless/ath/ath10k/core.h

+1 −0
Original line number Diff line number Diff line
@@ -676,6 +676,7 @@ struct ath10k_fw_components { 
struct ath10k {

	struct ath_common ath_common;

	struct ieee80211_hw *hw;

	struct ieee80211_ops *ops;

	struct device *dev;

	u8 mac_addr[ETH_ALEN];

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

+22 −2
Original line number Diff line number Diff line
@@ -7506,21 +7506,32 @@ static const struct ieee80211_channel ath10k_5ghz_channels[] = { 
struct ath10k *ath10k_mac_create(size_t priv_size)

{

	struct ieee80211_hw *hw;

	struct ieee80211_ops *ops;

	struct ath10k *ar;



	hw = ieee80211_alloc_hw(sizeof(struct ath10k) + priv_size, &ath10k_ops);

	if (!hw)

	ops = kmemdup(&ath10k_ops, sizeof(ath10k_ops), GFP_KERNEL);

	if (!ops)

		return NULL;



	hw = ieee80211_alloc_hw(sizeof(struct ath10k) + priv_size, ops);

	if (!hw) {

		kfree(ops);

		return NULL;

	}



	ar = hw->priv;

	ar->hw = hw;

	ar->ops = ops;



	return ar;

}



void ath10k_mac_destroy(struct ath10k *ar)

{

	struct ieee80211_ops *ops = ar->ops;



	ieee80211_free_hw(ar->hw);

	kfree(ops);

}



static const struct ieee80211_iface_limit ath10k_if_limits[] = {
@@ -7954,6 +7965,15 @@ int ath10k_mac_register(struct ath10k *ar) 
			ath10k_warn(ar, "failed to initialise DFS pattern detector\n");

	}



	/* Current wake_tx_queue implementation imposes a significant

	 * performance penalty in some setups. The tx scheduling code needs

	 * more work anyway so disable the wake_tx_queue unless firmware

	 * supports the pull-push mechanism.

	 */

	if (!test_bit(ATH10K_FW_FEATURE_PEER_FLOW_CONTROL,

		      ar->running_fw->fw_file.fw_features))

		ar->ops->wake_tx_queue = NULL;



	ret = ath_regd_init(&ar->ath_common.regulatory, ar->hw->wiphy,

			    ath10k_reg_notifier);

	if (ret) {

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

+3 −3
Original line number Diff line number Diff line
@@ -847,8 +847,6 @@ static int ath6kl_cfg80211_disconnect(struct wiphy *wiphy, 


	up(&ar->sem);



	vif->sme_state = SME_DISCONNECTED;



	return 0;

}
@@ -1111,7 +1109,8 @@ void ath6kl_cfg80211_ch_switch_notify(struct ath6kl_vif *vif, int freq, 


	cfg80211_chandef_create(&chandef,

				ieee80211_get_channel(vif->ar->wiphy, freq),

				(mode == WMI_11G_HT20) ?

				(mode == WMI_11G_HT20 &&

				 ath6kl_band_2ghz.ht_cap.ht_supported) ?

					NL80211_CHAN_HT20 : NL80211_CHAN_NO_HT);



	mutex_lock(&vif->wdev.mtx);
@@ -2978,6 +2977,7 @@ static int ath6kl_stop_ap(struct wiphy *wiphy, struct net_device *dev) 


	ath6kl_wmi_disconnect_cmd(ar->wmi, vif->fw_vif_idx);

	clear_bit(CONNECTED, &vif->flags);

	netif_carrier_off(vif->ndev);



	/* Restore ht setting in firmware */

	return ath6kl_restore_htcap(vif);

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

+5 −4
Original line number Diff line number Diff line
@@ -1401,6 +1401,10 @@ void ath6kl_rx(struct htc_target *target, struct htc_packet *packet) 
		return;

	}



	pad_before_data_start =

		(le16_to_cpu(dhdr->info3) >> WMI_DATA_HDR_PAD_BEFORE_DATA_SHIFT)

			& WMI_DATA_HDR_PAD_BEFORE_DATA_MASK;



	/* Get the Power save state of the STA */

	if (vif->nw_type == AP_NETWORK) {

		meta_type = wmi_data_hdr_get_meta(dhdr);
@@ -1408,7 +1412,7 @@ void ath6kl_rx(struct htc_target *target, struct htc_packet *packet) 
		ps_state = !!((dhdr->info >> WMI_DATA_HDR_PS_SHIFT) &

			      WMI_DATA_HDR_PS_MASK);



		offset = sizeof(struct wmi_data_hdr);

		offset = sizeof(struct wmi_data_hdr) + pad_before_data_start;

		trig_state = !!(le16_to_cpu(dhdr->info3) & WMI_DATA_HDR_TRIG);



		switch (meta_type) {
@@ -1523,9 +1527,6 @@ void ath6kl_rx(struct htc_target *target, struct htc_packet *packet) 
	seq_no = wmi_data_hdr_get_seqno(dhdr);

	meta_type = wmi_data_hdr_get_meta(dhdr);

	dot11_hdr = wmi_data_hdr_get_dot11(dhdr);

	pad_before_data_start =

		(le16_to_cpu(dhdr->info3) >> WMI_DATA_HDR_PAD_BEFORE_DATA_SHIFT)

			& WMI_DATA_HDR_PAD_BEFORE_DATA_MASK;



	skb_pull(skb, sizeof(struct wmi_data_hdr));

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

+3 −15
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 


#include <linux/nl80211.h>

#include <linux/platform_device.h>

#include <linux/ath9k_platform.h>

#include <linux/module.h>

#include "ath9k.h"
@@ -58,22 +57,11 @@ static void ath_ahb_read_cachesize(struct ath_common *common, int *csz) 


static bool ath_ahb_eeprom_read(struct ath_common *common, u32 off, u16 *data)

{

	struct ath_softc *sc = (struct ath_softc *)common->priv;

	struct platform_device *pdev = to_platform_device(sc->dev);

	struct ath9k_platform_data *pdata;



	pdata = dev_get_platdata(&pdev->dev);

	if (off >= (ARRAY_SIZE(pdata->eeprom_data))) {

		ath_err(common,

			"%s: flash read failed, offset %08x is out of range\n",

			__func__, off);

	ath_err(common, "%s: eeprom data has to be provided externally\n",

		__func__);

	return false;

}



	*data = pdata->eeprom_data[off];

	return true;

}



static struct ath_bus_ops ath_ahb_bus_ops  = {

	.ath_bus_type = ATH_AHB,

	.read_cachesize = ath_ahb_read_cachesize,