Merge branch 'fixes-davem' of master.kernel.org:/pub/scm/linux/kernel…

…/git/linville/wireless-2.6
git-mirror · Aug 15, 2007 · cd8d60f · cd8d60f
2 parents 16f3051 + b9bf1e6
commit cd8d60f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up @@
     			memset(skb->cb, 0, sizeof(skb->cb));
     			netif_rx(skb);
     			skb = skb2;
-    			break;
     		}
     	}
      out:
@@ Expand Down @@