The following commit has been merged in the linux branch: commit 5e4708bcb5d5360730e31b14e5e36429fc7d48b2 Author: Felix Fietkau nbd@openwrt.org Date: Sun Oct 11 05:21:10 2009 +0200
mac80211: fix logic error ibss merge bssid check
Signed-off-by: Felix Fietkau nbd@openwrt.org Acked-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 920ec87..812cbab 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -544,7 +544,7 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata) "%pM\n", bss->cbss.bssid, ifibss->bssid); #endif /* CONFIG_MAC80211_IBSS_DEBUG */
- if (bss && memcmp(ifibss->bssid, bss->cbss.bssid, ETH_ALEN)) { + if (bss && !memcmp(ifibss->bssid, bss->cbss.bssid, ETH_ALEN)) { printk(KERN_DEBUG "%s: Selected IBSS BSSID %pM" " based on configured SSID\n", sdata->dev->name, bss->cbss.bssid);