]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
mac80211: ieee80211_ibss_commit() cleanup
authorAlina Friedrichsen <x-alina@gmx.net>
Mon, 9 Mar 2009 23:49:46 +0000 (00:49 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Sat, 28 Mar 2009 00:12:41 +0000 (20:12 -0400)
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>
net/mac80211/ibss.c

index f4becc12904eb3c830649292660a89067b27c4b5..3201e1f96365649a5c1ad56f898afa20af9ddf0a 100644 (file)
@@ -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)