2 files changed, 5 insertions, 5 deletions

diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c
index 9f95354f859..e74a1a2119d 100644
--- a/net/wireless/mlme.c
+++ b/net/wireless/mlme.c
@@ -44,10 +44,10 @@ void cfg80211_send_rx_auth(struct net_device *dev, const u8 *buf, size_t len)
                 }
         }
 
-        WARN_ON(!done);
-
-        nl80211_send_rx_auth(rdev, dev, buf, len, GFP_KERNEL);
-        cfg80211_sme_rx_auth(dev, buf, len);
+        if (done) {
+                nl80211_send_rx_auth(rdev, dev, buf, len, GFP_KERNEL);
+                cfg80211_sme_rx_auth(dev, buf, len);
+        }
 
         wdev_unlock(wdev);
 }
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 85285b43d37..fbfac588297 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -877,7 +877,7 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
                 int idx, mbm = 0;
 
                 if (!rdev->ops->set_tx_power) {
-                        return -EOPNOTSUPP;
+                        result = -EOPNOTSUPP;
                         goto bad_res;
                 }