Explicitly ignore ibss merge requests when the node is ic_bss. This can

happen on the first management frame received from a neighbor; we assume
any merge candidate will send more frames and those should be processed
with a suitable table entry.

Stepped on by:	Tai-hwa Liang
This commit is contained in:
Sam Leffler 2005-01-18 20:30:16 +00:00
parent d81080b30a
commit 96acc1b61c
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=140453

View file

@ -727,7 +727,8 @@ int
ieee80211_ibss_merge(struct ieee80211com *ic, struct ieee80211_node *ni)
{
if (IEEE80211_ADDR_EQ(ni->ni_bssid, ic->ic_bss->ni_bssid)) {
if (ni == ic->ic_bss ||
IEEE80211_ADDR_EQ(ni->ni_bssid, ic->ic_bss->ni_bssid)) {
/* unchanged, nothing to do */
return 0;
}