Skip to content

L
linux
Commit cd8d60f2 authored by David S. Miller's avatar David S. Miller
Browse files
Options

Merge branch 'fixes-davem' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6

parents 16f3051b b9bf1e60
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
net/mac80211/ieee80211.c
View file @ cd8d60f2
...@@ -4678,7 +4678,6 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb, ...@@ -4678,7 +4678,6 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb,
memset(skb->cb, 0, sizeof(skb->cb)); memset(skb->cb, 0, sizeof(skb->cb));
netif_rx(skb); netif_rx(skb);
skb = skb2; skb = skb2;
break;
} }
} }
out: out:
......
net/mac80211/ieee80211_sta.c
View file @ cd8d60f2
...@@ -2154,7 +2154,11 @@ static int ieee80211_sta_config_auth(struct net_device *dev, ...@@ -2154,7 +2154,11 @@ static int ieee80211_sta_config_auth(struct net_device *dev,
return 0; return 0;
} else { } else {
if (ifsta->state != IEEE80211_AUTHENTICATE) { 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; ifsta->state = IEEE80211_AUTHENTICATE;
set_bit(IEEE80211_STA_REQ_AUTH, &ifsta->request); set_bit(IEEE80211_STA_REQ_AUTH, &ifsta->request);
} else } else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7