ath10k: don't remove peer that doesn't exist

If peer creation failed during offchannel Tx the
driver attempted to delete the peer nonetheless.
This caused the ar->num_peers counter to be
incorrectly decremented. This subsequently could
cause the counter to drop below 0 and also
eventually lead to firmware crash because host
would think there are less peer entries created in
firmware then there really were.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 53c627a58384b9497e12036eb2568e0727f6debd..cf74db7b182cc24b01e9fbeb0ac6c97d22fec576 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -3335,6 +3335,7 @@ void ath10k_offchan_tx_work(struct work_struct *work)
        int vdev_id;
        int ret;
        unsigned long time_left;
+       bool tmp_peer_created = false;
 
        /* FW requirement: We must create a peer before FW will send out
         * an offchannel frame. Otherwise the frame will be stuck and
@@ -3372,6 +3373,7 @@ void ath10k_offchan_tx_work(struct work_struct *work)
                        if (ret)
                                ath10k_warn(ar, "failed to create peer %pM on vdev %d: %d\n",
                                            peer_addr, vdev_id, ret);
+                       tmp_peer_created = (ret == 0);
                }
 
                spin_lock_bh(&ar->data_lock);
@@ -3387,7 +3389,7 @@ void ath10k_offchan_tx_work(struct work_struct *work)
                        ath10k_warn(ar, "timed out waiting for offchannel skb %p\n",
                                    skb);
 
-               if (!peer) {
+               if (!peer && tmp_peer_created) {
                        ret = ath10k_peer_delete(ar, vdev_id, peer_addr);
                        if (ret)
                                ath10k_warn(ar, "failed to delete peer %pM on vdev %d: %d\n",