diff options
| -rw-r--r-- | sys/dev/ath/if_ath.c | 2 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_node.c | 3 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_node.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c index 65d2892..bbdba2a 100644 --- a/sys/dev/ath/if_ath.c +++ b/sys/dev/ath/if_ath.c @@ -2601,7 +2601,7 @@ ath_recv_mgmt(struct ieee80211com *ic, struct mbuf *m, "ibss merge, rstamp %u tsf %ju " "tstamp %ju\n", rstamp, (uintmax_t)tsf, (uintmax_t)ni->ni_tstamp.tsf); - (void) ieee80211_ibss_merge(ic, ni); + (void) ieee80211_ibss_merge(ni); } } break; diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index a1181de..ef1b78a 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -733,8 +733,9 @@ ieee80211_end_scan(struct ieee80211com *ic) * Return !0 if the BSSID changed, 0 otherwise. */ int -ieee80211_ibss_merge(struct ieee80211com *ic, struct ieee80211_node *ni) +ieee80211_ibss_merge(struct ieee80211_node *ni) { + struct ieee80211com *ic = ni->ni_ic; if (ni == ic->ic_bss || IEEE80211_ADDR_EQ(ni->ni_bssid, ic->ic_bss->ni_bssid)) { diff --git a/sys/net80211/ieee80211_node.h b/sys/net80211/ieee80211_node.h index 0d89490..96f642d 100644 --- a/sys/net80211/ieee80211_node.h +++ b/sys/net80211/ieee80211_node.h @@ -191,7 +191,7 @@ void ieee80211_create_ibss(struct ieee80211com*, struct ieee80211_channel *); void ieee80211_reset_bss(struct ieee80211com *); void ieee80211_cancel_scan(struct ieee80211com *); void ieee80211_end_scan(struct ieee80211com *); -int ieee80211_ibss_merge(struct ieee80211com *, struct ieee80211_node *); +int ieee80211_ibss_merge(struct ieee80211_node *); int ieee80211_sta_join(struct ieee80211com *, struct ieee80211_node *); void ieee80211_sta_leave(struct ieee80211com *, struct ieee80211_node *); |
