PERFORCE change 69443 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=69443

Change 69443 by sam at sam_ebb on 2005/01/21 16:29:03

	handle potential stale values of bssid in neighbor nodes that
	can occur after an ibss merge

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_output.c#35 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#35 (text+ko) ====

@@ -580,7 +580,11 @@
 		wh->i_fc[1] = IEEE80211_FC1_DIR_NODS;
 		IEEE80211_ADDR_COPY(wh->i_addr1, eh.ether_dhost);
 		IEEE80211_ADDR_COPY(wh->i_addr2, eh.ether_shost);
-		IEEE80211_ADDR_COPY(wh->i_addr3, ni->ni_bssid);
+		/*
+		 * NB: always use the bssid from ic_bss as the
+		 *     neighbor's may be stale after an ibss merge
+		 */
+		IEEE80211_ADDR_COPY(wh->i_addr3, ic->ic_bss->ni_bssid);
 		break;
 	case IEEE80211_M_HOSTAP:
 		wh->i_fc[1] = IEEE80211_FC1_DIR_FROMDS;