From 59f7bb6fbfc5386b19f905d249eb62b7ad6769bd Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 29 Apr 2019 17:20:43 +0200 Subject: [PATCH] Revert "mt76: mt76x02: send no-skb tx status without holding the status lock" This reverts commit 4d8c7e82844c8ed0c2ba8c452534768ea04be627. To be replaced by upstream fix Signed-off-by: Felix Fietkau --- mt76x02_mac.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/mt76x02_mac.c b/mt76x02_mac.c index 92798187..a54e615f 100644 --- a/mt76x02_mac.c +++ b/mt76x02_mac.c @@ -469,7 +469,6 @@ void mt76x02_send_tx_status(struct mt76x02_dev *dev, struct mt76x02_sta *msta = NULL; struct mt76_dev *mdev = &dev->mt76; struct sk_buff_head list; - bool status_noskb = false; if (stat->pktid == MT_PACKET_ID_NO_ACK) return; @@ -524,14 +523,10 @@ void mt76x02_send_tx_status(struct mt76x02_dev *dev, if (status.skb) mt76_tx_status_skb_done(mdev, status.skb, &list); else - status_noskb = true; + ieee80211_tx_status_ext(mt76_hw(dev), &status); out: mt76_tx_status_unlock(mdev, &list); - - if (status_noskb) - ieee80211_tx_status_ext(mt76_hw(dev), &status); - rcu_read_unlock(); }