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
eb5749cdd6
commit
ae59d17866
@ -727,7 +727,8 @@ int
|
|||||||
ieee80211_ibss_merge(struct ieee80211com *ic, struct ieee80211_node *ni)
|
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 */
|
/* unchanged, nothing to do */
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user