diff options
| author | David S. Miller <davem@davemloft.net> | 2024-10-25 10:44:41 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2024-10-25 10:44:41 +0100 |
| commit | e31a8219fbfcf9dc65ba1e1c10cade12b6754e00 (patch) | |
| tree | 2f238eb1a773ad54f0bedf5cd4ef6dd7e9edc294 /drivers/net/wireless/mediatek/mt76/mcu.c | |
| parent | d44cd8226449114780a8554fd253c7e3d171a0a6 (diff) | |
| parent | a940b3a1ad0f5bab139fd710dd433aec4eeaea85 (diff) | |
Merge tag 'wireless-2024-10-21' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless
wireless fixes for v6.12-rc5
The first set of wireless fixes for v6.12. We have been busy and have
not been able to send this earlier, so there are more fixes than
usual. The fixes are all over, both in stack and in drivers, but
nothing special really standing out.
Diffstat (limited to 'drivers/net/wireless/mediatek/mt76/mcu.c')
| -rw-r--r-- | drivers/net/wireless/mediatek/mt76/mcu.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mcu.c b/drivers/net/wireless/mediatek/mt76/mcu.c index 98da82b74094..3353012e8542 100644 --- a/drivers/net/wireless/mediatek/mt76/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mcu.c @@ -84,13 +84,16 @@ int mt76_mcu_skb_send_and_get_msg(struct mt76_dev *dev, struct sk_buff *skb, mutex_lock(&dev->mcu.mutex); if (dev->mcu_ops->mcu_skb_prepare_msg) { + orig_skb = skb; ret = dev->mcu_ops->mcu_skb_prepare_msg(dev, skb, cmd, &seq); if (ret < 0) goto out; } retry: - orig_skb = skb_get(skb); + /* orig skb might be needed for retry, mcu_skb_send_msg consumes it */ + if (orig_skb) + skb_get(orig_skb); ret = dev->mcu_ops->mcu_skb_send_msg(dev, skb, cmd, &seq); if (ret < 0) goto out; @@ -105,7 +108,7 @@ retry: do { skb = mt76_mcu_get_response(dev, expires); if (!skb && !test_bit(MT76_MCU_RESET, &dev->phy.state) && - retry++ < dev->mcu_ops->max_retry) { + orig_skb && retry++ < dev->mcu_ops->max_retry) { dev_err(dev->dev, "Retry message %08x (seq %d)\n", cmd, seq); skb = orig_skb; |