Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Several cases of overlapping changes, except the packet scheduler
conflicts which deal with the addition of the free list parameter
to qdisc_enqueue().

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 3a170b1bf99b..d4b7a168f7c0 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -708,10 +708,10 @@ static int ath10k_peer_create(struct ath10k *ar,
 
         peer = ath10k_peer_find(ar, vdev_id, addr);
         if (!peer) {
+                spin_unlock_bh(&ar->data_lock);
                 ath10k_warn(ar, "failed to find peer %pM on vdev %i after creation\n",
                             addr, vdev_id);
                 ath10k_wmi_peer_delete(ar, vdev_id, addr);
-                spin_unlock_bh(&ar->data_lock);
                 return -ENOENT;
         }