diff options
| author | sam <sam@FreeBSD.org> | 2005-07-22 17:54:40 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2005-07-22 17:54:40 +0000 |
| commit | f149e5611056a55b5c10604159afd5c0c682cf10 (patch) | |
| tree | 9cd124accb874ce056754f5c8fb49332bd18bf0e /sys/net80211 | |
| parent | c12da29e65a07d21e2fa980555dceaa8c0100855 (diff) | |
| download | FreeBSD-src-f149e5611056a55b5c10604159afd5c0c682cf10.zip FreeBSD-src-f149e5611056a55b5c10604159afd5c0c682cf10.tar.gz | |
simplify ieee80211_ibss_merge api
MFC after: 3 days
Diffstat (limited to 'sys/net80211')
| -rw-r--r-- | sys/net80211/ieee80211_node.c | 3 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_node.h | 2 |
2 files changed, 3 insertions, 2 deletions
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 *); |
