Commit 11bde899 authored by David S. Miller's avatar David S. Miller

Merge tag 'wireless-drivers-for-davem-2018-10-01' of...

Merge tag 'wireless-drivers-for-davem-2018-10-01' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers

Kalle Valo says:

====================
wireless-drivers fixes for 4.19

First, and also hopefully the last, set of fixes for 4.19. All small
but still important fixes

mt76x0

* fix a bug when a virtual interface is removed multiple times

b43

* fix DMA error related regression with proprietary firmware

iwlwifi

* fix an oops which was a regression in v4.19-rc1
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0e1d6eca 3baafeff
...@@ -1518,13 +1518,15 @@ void b43_dma_handle_txstatus(struct b43_wldev *dev, ...@@ -1518,13 +1518,15 @@ void b43_dma_handle_txstatus(struct b43_wldev *dev,
} }
} else { } else {
/* More than a single header/data pair were missed. /* More than a single header/data pair were missed.
* Report this error, and reset the controller to * Report this error. If running with open-source
* firmware, then reset the controller to
* revive operation. * revive operation.
*/ */
b43dbg(dev->wl, b43dbg(dev->wl,
"Out of order TX status report on DMA ring %d. Expected %d, but got %d\n", "Out of order TX status report on DMA ring %d. Expected %d, but got %d\n",
ring->index, firstused, slot); ring->index, firstused, slot);
b43_controller_restart(dev, "Out of order TX"); if (dev->fw.opensource)
b43_controller_restart(dev, "Out of order TX");
return; return;
} }
} }
......
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
static const struct iwl_base_params iwl1000_base_params = { static const struct iwl_base_params iwl1000_base_params = {
.num_of_queues = IWLAGN_NUM_QUEUES, .num_of_queues = IWLAGN_NUM_QUEUES,
.max_tfd_queue_size = 256,
.eeprom_size = OTP_LOW_IMAGE_SIZE, .eeprom_size = OTP_LOW_IMAGE_SIZE,
.pll_cfg = true, .pll_cfg = true,
.max_ll_items = OTP_MAX_LL_ITEMS_1000, .max_ll_items = OTP_MAX_LL_ITEMS_1000,
......
...@@ -77,9 +77,8 @@ static void mt76x0_remove_interface(struct ieee80211_hw *hw, ...@@ -77,9 +77,8 @@ static void mt76x0_remove_interface(struct ieee80211_hw *hw,
{ {
struct mt76x0_dev *dev = hw->priv; struct mt76x0_dev *dev = hw->priv;
struct mt76_vif *mvif = (struct mt76_vif *) vif->drv_priv; struct mt76_vif *mvif = (struct mt76_vif *) vif->drv_priv;
unsigned int wcid = mvif->group_wcid.idx;
dev->wcid_mask[wcid / BITS_PER_LONG] &= ~BIT(wcid % BITS_PER_LONG); dev->vif_mask &= ~BIT(mvif->idx);
} }
static int mt76x0_config(struct ieee80211_hw *hw, u32 changed) static int mt76x0_config(struct ieee80211_hw *hw, u32 changed)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment