diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2009-07-07 14:37:26 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-07-10 15:02:30 -0400 |
| commit | 3e5d7649a64e558e4146ddfad4dfcf13fc65dd47 (patch) | |
| tree | fa51725ca07cf682e6694ba5f107d8614d9f0972 /net/mac80211/cfg.c | |
| parent | 2ffa5fede379091bf62a732462b829e4b51af054 (diff) | |
| download | op-kernel-dev-3e5d7649a64e558e4146ddfad4dfcf13fc65dd47.zip op-kernel-dev-3e5d7649a64e558e4146ddfad4dfcf13fc65dd47.tar.gz | |
cfg80211: let SME control reassociation vs. association
Since we don't really know that well in the kernel,
let's let the SME control whether it wants to use
reassociation or not, by allowing it to give the
previous BSSID in the associate() parameters.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 0f29cd0..e6d8860 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1256,6 +1256,12 @@ static int ieee80211_assoc(struct wiphy *wiphy, struct net_device *dev, sdata->u.mgd.flags &= ~IEEE80211_STA_MFP_ENABLED; } + if (req->prev_bssid) { + sdata->u.mgd.flags |= IEEE80211_STA_PREV_BSSID_SET; + memcpy(sdata->u.mgd.prev_bssid, req->prev_bssid, ETH_ALEN); + } else + sdata->u.mgd.flags &= ~IEEE80211_STA_PREV_BSSID_SET; + if (req->crypto.control_port) sdata->u.mgd.flags |= IEEE80211_STA_CONTROL_PORT; else |
