diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-01-02 15:23:34 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-02 15:23:34 -0500 |
| commit | 85eb018fec29eae60d20f6d04af854308ffb3a05 (patch) | |
| tree | 4bacd101fd5843d973d2ad645e9efebcb2482c61 /drivers/net/wireless/ath/ath10k/pci.c | |
| parent | net: stmmac: remove unused duplicate property snps,axi_all (diff) | |
| parent | rtlwifi: fix spelling mistake: "encrypiton" -> "encryption" (diff) | |
| download | linux-dev-85eb018fec29eae60d20f6d04af854308ffb3a05.tar.xz linux-dev-85eb018fec29eae60d20f6d04af854308ffb3a05.zip | |
Merge tag 'wireless-drivers-next-for-davem-2017-01-02' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says:
====================
wireless-drivers-next patches for 4.11
The most notable change here is the inclusion of airtime fairness
scheduling to ath9k. It prevents slow clients from hogging all the
airtime and unfairly slowing down faster clients.
Otherwise smaller changes and cleanup.
Major changes:
ath9k
* cleanup eeprom endian handling
* add airtime fairness scheduling
ath10k
* fix issues for new QCA9377 firmware version
* support dev_coredump() for firmware crash dump
* enable channel 169 on 5 GHz band
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/ath/ath10k/pci.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index b541a1c74488..93b9790cfe8d 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c @@ -1973,7 +1973,7 @@ static int ath10k_pci_get_num_banks(struct ath10k *ar) } break; case QCA9377_1_0_DEVICE_ID: - return 2; + return 4; } ath10k_warn(ar, "unknown number of banks, assuming 1\n"); @@ -3132,7 +3132,7 @@ int ath10k_pci_setup_resource(struct ath10k *ar) setup_timer(&ar_pci->rx_post_retry, ath10k_pci_rx_replenish_retry, (unsigned long)ar); - if (QCA_REV_6174(ar)) + if (QCA_REV_6174(ar) || QCA_REV_9377(ar)) ath10k_pci_override_ce_config(ar); ret = ath10k_pci_alloc_pipes(ar); |