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

cleanup bss node setup; syncs w/ p4 state that's been in use for months

Browse Source
This commit is contained in:
Sam Leffler 2008-09-22 00:22:09 +00:00
parent 86c55fc405
commit b9b5f07d1c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=183259
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/net80211/ieee80211_node.c
View File

@ -1041,6 +1041,8 @@ ieee80211_tmp_node(struct ieee80211vap *vap,
ni = ic->ic_node_alloc(vap, macaddr);
if (ni != NULL) {
struct ieee80211_node *bss = vap->iv_bss;
IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE,
"%s %p<%s>\n", __func__, ni, ether_sprintf(macaddr));
@ -1049,12 +1051,13 @@ ieee80211_tmp_node(struct ieee80211vap *vap,
ni->ni_vap = vap;
IEEE80211_ADDR_COPY(ni->ni_macaddr, macaddr);
IEEE80211_ADDR_COPY(ni->ni_bssid, vap->iv_bss->ni_bssid);
IEEE80211_ADDR_COPY(ni->ni_bssid, bss->ni_bssid);
ieee80211_node_initref(ni); /* mark referenced */
/* NB: required by ieee80211_fix_rate */
ieee80211_node_set_chan(ni, vap->iv_bss->ni_chan);
ieee80211_node_set_chan(ni, bss->ni_chan);
ieee80211_crypto_resetkey(vap, &ni->ni_ucastkey,
IEEE80211_KEYIX_NONE);
ni->ni_txpower = bss->ni_txpower;
/* XXX optimize away */
IEEE80211_NODE_SAVEQ_INIT(ni, "unknown");
IEEE80211_NODE_WDSQ_INIT(ni, "unknown");
@ -1074,13 +1077,13 @@ ieee80211_dup_bss(struct ieee80211vap *vap,
ni = ieee80211_alloc_node(&ic->ic_sta, vap, macaddr);
if (ni != NULL) {
struct ieee80211_node *bss = vap->iv_bss;
/*
* Inherit from iv_bss.
*/
ni->ni_authmode = vap->iv_bss->ni_authmode;
ni->ni_vlan = vap->iv_bss->ni_vlan; /* XXX?? */
IEEE80211_ADDR_COPY(ni->ni_bssid, vap->iv_bss->ni_bssid);
ieee80211_node_set_chan(ni, vap->iv_bss->ni_chan);
copy_bss(ni, bss);
IEEE80211_ADDR_COPY(ni->ni_bssid, bss->ni_bssid);
ieee80211_node_set_chan(ni, bss->ni_chan);
}
return ni;
}
@ -1107,8 +1110,7 @@ ieee80211_node_create_wds(struct ieee80211vap *vap,
/*
* Inherit any manually configured settings.
*/
ni->ni_authmode = vap->iv_bss->ni_authmode;
ni->ni_vlan = vap->iv_bss->ni_vlan;
copy_bss(ni, vap->iv_bss);
ieee80211_node_set_chan(ni, chan);
/* NB: propagate ssid so available to WPA supplicant */
ni->ni_esslen = vap->iv_des_ssid[0].len;