diff options
| author |   Alina Friedrichsen <x-alina@gmx.net> | 2009-02-21 01:27:29 +0100 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2009-02-27 14:52:54 -0500 |
| commit | 79f6440c527c61bcd84edfbdeb390841b9fe5095 (patch) | |
| tree | 90d86bb64fade58b3acdc8b5954b9e9148c963bd /net/mac80211/ibss.c | |
| parent | b43: Convert usage of b43_radio_maskset() (diff) | |
| download | linux-dev-79f6440c527c61bcd84edfbdeb390841b9fe5095.tar.xz linux-dev-79f6440c527c61bcd84edfbdeb390841b9fe5095.zip | |
mac80211: Introduce a generic commit() to apply changes
This patch introduces a generic commit() function which initiate a
new network joining process. It should be called after some interface
config changes, so that the changes get applied more cleanly. Currently
set_ssid() and set_bssid() call it. Others can be added in future
patches.
In version 1 the header files was forgotten, sorry.
Signed-off-by: Alina Friedrichsen <x-alina@gmx.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/ibss.c')
| -rw-r--r-- | net/mac80211/ibss.c | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index 1bbfc7029879..aa8937c56285 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -788,6 +788,23 @@ void ieee80211_ibss_setup_sdata(struct ieee80211_sub_if_data *sdata) IEEE80211_IBSS_AUTO_CHANNEL_SEL; } +int ieee80211_ibss_commit(struct ieee80211_sub_if_data *sdata) +{ + struct ieee80211_if_ibss *ifibss = &sdata->u.ibss; + + ifibss->flags &= ~IEEE80211_IBSS_PREV_BSSID_SET; + + if (ifibss->ssid_len) + ifibss->flags |= IEEE80211_IBSS_SSID_SET; + else + ifibss->flags &= ~IEEE80211_IBSS_SSID_SET; + + ifibss->ibss_join_req = jiffies; + ifibss->state = IEEE80211_IBSS_MLME_SEARCH; + + return ieee80211_sta_find_ibss(sdata); +} + int ieee80211_ibss_set_ssid(struct ieee80211_sub_if_data *sdata, char *ssid, size_t len) { struct ieee80211_if_ibss *ifibss = &sdata->u.ibss; @@ -801,16 +818,7 @@ int ieee80211_ibss_set_ssid(struct ieee80211_sub_if_data *sdata, char *ssid, siz ifibss->ssid_len = len; } - ifibss->flags &= ~IEEE80211_IBSS_PREV_BSSID_SET; - - if (len) - ifibss->flags |= IEEE80211_IBSS_SSID_SET; - else - ifibss->flags &= ~IEEE80211_IBSS_SSID_SET; - - ifibss->ibss_join_req = jiffies; - ifibss->state = IEEE80211_IBSS_MLME_SEARCH; - return ieee80211_sta_find_ibss(sdata); + return ieee80211_ibss_commit(sdata); } int ieee80211_ibss_get_ssid(struct ieee80211_sub_if_data *sdata, char *ssid, size_t *len) @@ -842,7 +850,7 @@ int ieee80211_ibss_set_bssid(struct ieee80211_sub_if_data *sdata, u8 *bssid) } } - return ieee80211_ibss_set_ssid(sdata, ifibss->ssid, ifibss->ssid_len); + return ieee80211_ibss_commit(sdata); } /* scan finished notification */ |