aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-05-20 09:05:10 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-05-20 14:46:36 -0400
commitdb67645db623caa12976293caa95fcd33d8c11b4 (patch)
treee85cd5cb8d9e6a47be5f9fdd3f7fbd59c81b0a14 /net
parentc26c2e576dc05d90e8eadc0c6ca273ed7aa12535 (diff)
downloadmrst-s0i3-test-db67645db623caa12976293caa95fcd33d8c11b4.tar.gz
mrst-s0i3-test-db67645db623caa12976293caa95fcd33d8c11b4.tar.xz
mrst-s0i3-test-db67645db623caa12976293caa95fcd33d8c11b4.zip
mac80211: fix parameter confusion when finding IBSS
When I fixed the crypto bit I must have done the negative test only -- it is quite clearly impossible to find _any_ IBSS to join with the parameters put the wrong way around. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/ibss.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index ebf7318b610..0b30277eb36 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -535,9 +535,9 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata)
bssid = ifibss->bssid;
bss = (void *)cfg80211_get_bss(local->hw.wiphy, chan, bssid,
ifibss->ssid, ifibss->ssid_len,
- capability,
WLAN_CAPABILITY_IBSS |
- WLAN_CAPABILITY_PRIVACY);
+ WLAN_CAPABILITY_PRIVACY,
+ capability);
#ifdef CONFIG_MAC80211_IBSS_DEBUG
if (bss)