d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplify ieee80211_ibss_merge api

Browse Source 
MFC after:	3 days
This commit is contained in:
sam 2005-07-22 17:54:40 +00:00
parent c12da29e65
commit f149e56110
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/ath/if_ath.c
View File

@ -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;

3
sys/net80211/ieee80211_node.c
View File

@ -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)) {

2
sys/net80211/ieee80211_node.h
View File

@ -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 *);