diff options
| author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2009-05-27 22:56:05 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-06-03 14:05:11 -0400 |
| commit | 86ab04c8c1df51df7d6d3709da546e0163ac856b (patch) | |
| tree | a9683cc31ed8b7f40b2ea8a066ef8619f37ee777 /net | |
| parent | 2c5b9e511fee1a856ffe6332e15c72a20d2c72f6 (diff) | |
| download | linux-3.10-86ab04c8c1df51df7d6d3709da546e0163ac856b.tar.gz linux-3.10-86ab04c8c1df51df7d6d3709da546e0163ac856b.tar.bz2 linux-3.10-86ab04c8c1df51df7d6d3709da546e0163ac856b.zip | |
mac80211: handle -EALREADY on cfg80211 op assoc req
When the SME requests to associate to an open AP
ieee80211_sta_set_extra_ie() can be called with zero IE
length. When this happens or when the extra IE has already
been set -EALREADY is passed down and the supplicant will
complain that the operation is already in progress and it will
not let us associate. We correct this by treating -EALREADY
from ieee80211_sta_set_extra_ie() as a success just as we do
for wext.
Cc: Shan.Palanisamy@Atheros.com
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/cfg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index cdfdb2eaad9..d2fc18c1ae0 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1256,7 +1256,7 @@ static int ieee80211_assoc(struct wiphy *wiphy, struct net_device *dev, sdata->u.mgd.flags |= IEEE80211_STA_AUTO_SSID_SEL; ret = ieee80211_sta_set_extra_ie(sdata, req->ie, req->ie_len); - if (ret) + if (ret && ret != -EALREADY) return ret; if (req->use_mfp) { |