summaryrefslogtreecommitdiffstats
path: root/net/mac80211/ibss.c
diff options
context:
space:
mode:
authorAlina Friedrichsen <x-alina@gmx.net>2009-03-10 00:49:46 +0100
committerJohn W. Linville <linville@tuxdriver.com>2009-03-28 01:12:41 +0100
commitfa56dddd6720c8d4b9fa4c942377d2a019cf3708 (patch)
tree277e686dce699abf980336ee4c235d3802776b66 /net/mac80211/ibss.c
parentucc_geth: Fix three oopses in PHY {de,}initialization code (diff)
downloadlinux-fa56dddd6720c8d4b9fa4c942377d2a019cf3708.tar.xz
linux-fa56dddd6720c8d4b9fa4c942377d2a019cf3708.zip
mac80211: ieee80211_ibss_commit() cleanup
Don't call ieee80211_sta_find_ibss() directly, like it's done in STA mode, so that the commit() call is more harmless respectively has less site-effects. 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.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index f4becc12904e..3201e1f96365 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -812,8 +812,9 @@ int ieee80211_ibss_commit(struct ieee80211_sub_if_data *sdata)
ifibss->ibss_join_req = jiffies;
ifibss->state = IEEE80211_IBSS_MLME_SEARCH;
+ set_bit(IEEE80211_IBSS_REQ_RUN, &ifibss->request);
- return ieee80211_sta_find_ibss(sdata);
+ return 0;
}
int ieee80211_ibss_set_ssid(struct ieee80211_sub_if_data *sdata, char *ssid, size_t len)