diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-08-14 18:32:20 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-08-14 18:32:20 -0700 |
| commit | cd8d60f28f519786f00d64d68bb3b7669bdfbcb8 (patch) | |
| tree | 413685703c5d47aae38b51d673a31813907069dd /net | |
| parent | 16f3051b166bde3f1bd741783b64a8feebdb6f00 (diff) | |
| parent | b9bf1e60a294fc7795d5198f94a917290e52865b (diff) | |
| download | linux-3.10-cd8d60f28f519786f00d64d68bb3b7669bdfbcb8.tar.gz linux-3.10-cd8d60f28f519786f00d64d68bb3b7669bdfbcb8.tar.bz2 linux-3.10-cd8d60f28f519786f00d64d68bb3b7669bdfbcb8.zip | |
Merge branch 'fixes-davem' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/ieee80211.c | 1 | ||||
| -rw-r--r-- | net/mac80211/ieee80211_sta.c | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c index 8ec5ed192b5..7286c389a4d 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 7ba352e3ffe..0d99b685df5 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 |