Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[karo-tx-linux.git] / net / mac80211 / ibss.c

diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index f4becc12904eb3c830649292660a89067b27c4b5..3201e1f96365649a5c1ad56f898afa20af9ddf0a 100644 (file)
--- 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)