mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-20 23:35:02 +00:00
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:
parent
d81080b30a
commit
96acc1b61c
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=140453
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue