From 96acc1b61ce789a1ebb5c503b54b1da85f4ce4c0 Mon Sep 17 00:00:00 2001 From: Sam Leffler Date: Tue, 18 Jan 2005 20:30:16 +0000 Subject: 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 --- sys/net80211/ieee80211_node.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sys/net80211') diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index bfae047182e2..bc27733d98e9 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -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; } -- cgit v1.3