Skip to contentSkip to conversation

mac80211: fix logic error ibss merge bssid check

PATCH In review Felix Fietkau 2 participants 2 messages Oct 11, 2009 mac80211

lore
Share & tools
lore

Felix Fietkau

author
#0 lore raw

PATCH 1/1 mac80211: fix logic error ibss merge bssid check

Signed-off-by Felix Fietkau <[email protected]>
net/mac80211/ibss.c +1 -1
@@ -544,7 +544,7 @@ static void ieee80211_sta_find_ibss(stru
 		       "%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);
maintainer Acked-by on v1 1/1
#1 lore raw

net/mac80211/ibss.c static void ieee80211_sta_find_ibss(stru · line 547

Quoted 10 lines · Felix Fietkau
Signed-off-by Felix Fietkau <[email protected]>
net/mac80211/ibss.c +1 -1
@@ -544,7 +544,7 @@ static void ieee80211_sta_find_ibss(stru
 		       "%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)) {
Acked-by Johannes Berg <[email protected]>

I'll also send the race fix now, would appreciate you giving it a try.

Thanks,
johannes