2 files changed, 5 insertions, 2 deletions

diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 8ec5ed192b5d..7286c389a4d0 100644
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -4678,7 +4678,6 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb,
                         memset(skb->cb, 0, sizeof(skb->cb));
                         netif_rx(skb);
                         skb = skb2;
-                        break;
                 }
         }
  out:
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index 7ba352e3ffe0..0d99b685df5f 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@ -2154,7 +2154,11 @@ static int ieee80211_sta_config_auth(struct net_device *dev,
                 return 0;
         } else {
                 if (ifsta->state != IEEE80211_AUTHENTICATE) {
-                        ieee80211_sta_start_scan(dev, NULL, 0);
+                        if (ifsta->auto_ssid_sel)
+                                ieee80211_sta_start_scan(dev, NULL, 0);
+                        else
+                                ieee80211_sta_start_scan(dev, ifsta->ssid,
+                                                         ifsta->ssid_len);
                         ifsta->state = IEEE80211_AUTHENTICATE;
                         set_bit(IEEE80211_STA_REQ_AUTH, &ifsta->request);
                 } else