From: Johannes Berg <johannes@sipsolutions.net>
Date: Wed, 20 May 2009 07:05:10 +0000 (+0200)
Subject: mac80211: fix parameter confusion when finding IBSS
X-Git-Tag: v2.6.31-rc1~14^2~390^2~35
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=db67645db623caa12976293caa95fcd33d8c11b4;p=platform%2Fkernel%2Flinux-exynos.git

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>
---

diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index ebf7318..0b30277 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)