diff options
author | Lorenzo Bianconi <lorenzo@kernel.org> | 2022-12-08 11:46:40 +0100 |
---|---|---|
committer | Felix Fietkau <nbd@nbd.name> | 2022-12-09 16:45:39 +0100 |
commit | 96f134dc19645be4994e89a2f68fa89309becbee (patch) | |
tree | ea369e43312d3bb6b5dbc803d457a398581bfb0e /drivers/net/wireless/mediatek/mt76/mt7915 | |
parent | fe13dad8992be0b26c1be390bcd111acf9892c17 (diff) | |
download | lwn-96f134dc19645be4994e89a2f68fa89309becbee.tar.gz lwn-96f134dc19645be4994e89a2f68fa89309becbee.zip |
wifi: mt76: handle possible mt76_rx_token_consume failures
Take into account possible error conditions of mt76_rx_token_consume
routine in mt7915_mmio_wed_init_rx_buf() and mt76_dma_add_buf()
Fixes: cd372b8c99c5 ("wifi: mt76: add WED RX support to mt76_dma_{add,get}_buf")
Fixes: 4f831d18d12d ("wifi: mt76: mt7915: enable WED RX support")
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'drivers/net/wireless/mediatek/mt76/mt7915')
-rw-r--r-- | drivers/net/wireless/mediatek/mt76/mt7915/mmio.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c b/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c index 52be55dff947..afa558c9a930 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c @@ -653,6 +653,13 @@ static u32 mt7915_mmio_wed_init_rx_buf(struct mtk_wed_device *wed, int size) desc->buf0 = cpu_to_le32(phy_addr); token = mt76_rx_token_consume(&dev->mt76, ptr, t, phy_addr); + if (token < 0) { + dma_unmap_single(dev->mt76.dma_dev, phy_addr, + wed->wlan.rx_size, DMA_TO_DEVICE); + skb_free_frag(ptr); + goto unmap; + } + desc->token |= cpu_to_le32(FIELD_PREP(MT_DMA_CTL_TOKEN, token)); desc++; |