diff options
| author | Felix Fietkau <nbd@nbd.name> | 2020-09-30 04:01:01 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2020-12-04 13:46:14 +0100 |
| commit | 96a607b643e2d81351a9de584928928d3e54f395 (patch) | |
| tree | c8128aa9d6b46325073fb27d768d92636655b60e /drivers/net/wireless/mediatek/mt76/mt7603 | |
| parent | f320d812b7bbd30abb5699971051e8b494df6278 (diff) | |
mt76: move mcu timeout handling to .mcu_parse_response
Preparation for further cleanup
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'drivers/net/wireless/mediatek/mt76/mt7603')
| -rw-r--r-- | drivers/net/wireless/mediatek/mt76/mt7603/mcu.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c index 6cd947df6429..f787c9d3088e 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c @@ -17,8 +17,18 @@ static int mt7603_mcu_parse_response(struct mt76_dev *mdev, int cmd, struct sk_buff *skb, int seq) { - struct mt7603_mcu_rxd *rxd = (struct mt7603_mcu_rxd *)skb->data; + struct mt7603_dev *dev = container_of(mdev, struct mt7603_dev, mt76); + struct mt7603_mcu_rxd *rxd; + + if (!skb) { + dev_err(mdev->dev, + "MCU message %d (seq %d) timed out\n", + cmd, seq); + dev->mcu_hang = MT7603_WATCHDOG_TIMEOUT; + return -ETIMEDOUT; + } + rxd = (struct mt7603_mcu_rxd *)skb->data; if (seq != rxd->seq) return -EAGAIN; @@ -85,15 +95,6 @@ mt7603_mcu_msg_send(struct mt76_dev *mdev, int cmd, const void *data, while (wait_resp) { skb = mt76_mcu_get_response(&dev->mt76, expires); - if (!skb) { - dev_err(mdev->dev, - "MCU message %d (seq %d) timed out\n", - cmd, seq); - dev->mcu_hang = MT7603_WATCHDOG_TIMEOUT; - ret = -ETIMEDOUT; - break; - } - ret = mt7603_mcu_parse_response(mdev, cmd, skb, seq); dev_kfree_skb(skb); if (ret != -EAGAIN) |