diff options
| author | Felix Fietkau <nbd@nbd.name> | 2020-09-30 03:53:59 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2020-12-04 13:46:14 +0100 |
| commit | f320d812b7bbd30abb5699971051e8b494df6278 (patch) | |
| tree | bf3effeeb4900ed1b09f87bd1d022b06400e0bdd /drivers/net/wireless/mediatek/mt76/mt7603/mcu.c | |
| parent | fa62d0e0080bca76288b5184bbc2e04f5709b069 (diff) | |
mt76: implement .mcu_parse_response in struct mt76_mcu_ops
Do not free skb inside that function
Preparation for further cleanup
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'drivers/net/wireless/mediatek/mt76/mt7603/mcu.c')
| -rw-r--r-- | drivers/net/wireless/mediatek/mt76/mt7603/mcu.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c index ddef085f930d..6cd947df6429 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c @@ -14,6 +14,18 @@ struct mt7603_fw_trailer { } __packed; 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; + + if (seq != rxd->seq) + return -EAGAIN; + + return 0; +} + +static int __mt7603_mcu_msg_send(struct mt7603_dev *dev, struct sk_buff *skb, int cmd, int *wait_seq) { @@ -58,7 +70,6 @@ mt7603_mcu_msg_send(struct mt76_dev *mdev, int cmd, const void *data, { struct mt7603_dev *dev = container_of(mdev, struct mt7603_dev, mt76); unsigned long expires = jiffies + 3 * HZ; - struct mt7603_mcu_rxd *rxd; struct sk_buff *skb; int ret, seq; @@ -73,8 +84,6 @@ mt7603_mcu_msg_send(struct mt76_dev *mdev, int cmd, const void *data, goto out; while (wait_resp) { - bool check_seq = false; - skb = mt76_mcu_get_response(&dev->mt76, expires); if (!skb) { dev_err(mdev->dev, @@ -85,13 +94,9 @@ mt7603_mcu_msg_send(struct mt76_dev *mdev, int cmd, const void *data, break; } - rxd = (struct mt7603_mcu_rxd *)skb->data; - if (seq == rxd->seq) - check_seq = true; - + ret = mt7603_mcu_parse_response(mdev, cmd, skb, seq); dev_kfree_skb(skb); - - if (check_seq) + if (ret != -EAGAIN) break; } @@ -266,6 +271,7 @@ int mt7603_mcu_init(struct mt7603_dev *dev) static const struct mt76_mcu_ops mt7603_mcu_ops = { .headroom = sizeof(struct mt7603_mcu_txd), .mcu_send_msg = mt7603_mcu_msg_send, + .mcu_parse_response = mt7603_mcu_parse_response, .mcu_restart = mt7603_mcu_restart, }; |