summaryrefslogtreecommitdiff
path: root/sys/net80211
diff options
context:
space:
mode:
authorSam Leffler <sam@FreeBSD.org>2005-01-18 20:30:16 +0000
committerSam Leffler <sam@FreeBSD.org>2005-01-18 20:30:16 +0000
commit96acc1b61ce789a1ebb5c503b54b1da85f4ce4c0 (patch)
tree686583de266eec4e95c67340b905d91ea67b23f4 /sys/net80211
parentd81080b30a89cb054e0e77e230958a9c4b134855 (diff)
Notes
Diffstat (limited to 'sys/net80211')
-rw-r--r--sys/net80211/ieee80211_node.c3
1 files changed, 2 insertions, 1 deletions
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;
}