Module Name: src
Committed By: maxv
Date: Tue Jan 16 18:42:43 UTC 2018
Modified Files:
src/sys/dev/ic: bwfm.c
src/sys/net80211: ieee80211_input.c ieee80211_node.c ieee80211_node.h
Log Message:
Prepend 'sp_' to the name of the fields, so that they can easily be found
via NXR or grep.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/ic/bwfm.c
cvs rdiff -u -r1.106 -r1.107 src/sys/net80211/ieee80211_input.c
cvs rdiff -u -r1.72 -r1.73 src/sys/net80211/ieee80211_node.c
cvs rdiff -u -r1.27 -r1.28 src/sys/net80211/ieee80211_node.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/bwfm.c
diff -u src/sys/dev/ic/bwfm.c:1.9 src/sys/dev/ic/bwfm.c:1.10
--- src/sys/dev/ic/bwfm.c:1.9 Tue Jan 16 14:23:15 2018
+++ src/sys/dev/ic/bwfm.c Tue Jan 16 18:42:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bwfm.c,v 1.9 2018/01/16 14:23:15 maxv Exp $ */
+/* $NetBSD: bwfm.c,v 1.10 2018/01/16 18:42:43 maxv Exp $ */
/* $OpenBSD: bwfm.c,v 1.5 2017/10/16 22:27:16 patrick Exp $ */
/*
* Copyright (c) 2010-2016 Broadcom Corporation
@@ -1672,41 +1672,41 @@ bwfm_scan_node(struct bwfm_softc *sc, st
/* Build scan result */
memset(&scan, 0, sizeof(scan));
- scan.tstamp = (uint8_t *)&tsf;
- scan.bintval = le16toh(bss->beacon_period);
- scan.capinfo = le16toh(bss->capability);
- scan.bchan = ieee80211_chan2ieee(ic, ic->ic_curchan);
- scan.chan = scan.bchan;
- scan.rates = rates;
- scan.ssid = ssid;
+ scan.sp_tstamp = (uint8_t *)&tsf;
+ scan.sp_bintval = le16toh(bss->beacon_period);
+ scan.sp_capinfo = le16toh(bss->capability);
+ scan.sp_bchan = ieee80211_chan2ieee(ic, ic->ic_curchan);
+ scan.sp_chan = scan.sp_bchan;
+ scan.sp_rates = rates;
+ scan.sp_ssid = ssid;
for (frm = sfrm; frm < efrm; frm += frm[1] + 2) {
switch (frm[0]) {
case IEEE80211_ELEMID_COUNTRY:
- scan.country = frm;
+ scan.sp_country = frm;
break;
case IEEE80211_ELEMID_FHPARMS:
if (ic->ic_phytype == IEEE80211_T_FH) {
if (frm + 6 >= efrm)
break;
- scan.fhdwell = le16dec(&frm[2]);
- scan.chan = IEEE80211_FH_CHAN(frm[4], frm[5]);
- scan.fhindex = frm[6];
+ scan.sp_fhdwell = le16dec(&frm[2]);
+ scan.sp_chan = IEEE80211_FH_CHAN(frm[4], frm[5]);
+ scan.sp_fhindex = frm[6];
}
break;
case IEEE80211_ELEMID_DSPARMS:
if (ic->ic_phytype != IEEE80211_T_FH) {
if (frm + 2 >= efrm)
break;
- scan.chan = frm[2];
+ scan.sp_chan = frm[2];
}
break;
case IEEE80211_ELEMID_TIM:
- scan.tim = frm;
- scan.timoff = frm - sfrm;
+ scan.sp_tim = frm;
+ scan.sp_timoff = frm - sfrm;
break;
case IEEE80211_ELEMID_XRATES:
- scan.xrates = frm;
+ scan.sp_xrates = frm;
break;
case IEEE80211_ELEMID_ERP:
if (frm + 1 >= efrm)
@@ -1715,10 +1715,10 @@ bwfm_scan_node(struct bwfm_softc *sc, st
ic->ic_stats.is_rx_elem_toobig++;
break;
}
- scan.erp = frm[2];
+ scan.sp_erp = frm[2];
break;
case IEEE80211_ELEMID_RSN:
- scan.wpa = frm;
+ scan.sp_wpa = frm;
break;
case IEEE80211_ELEMID_VENDOR:
if (frm + 1 >= efrm)
@@ -1726,7 +1726,7 @@ bwfm_scan_node(struct bwfm_softc *sc, st
if (frm + frm[1] + 2 >= efrm)
break;
if (bwfm_iswpaoui(frm))
- scan.wpa = frm;
+ scan.sp_wpa = frm;
break;
}
if (frm + 1 >= efrm)
Index: src/sys/net80211/ieee80211_input.c
diff -u src/sys/net80211/ieee80211_input.c:1.106 src/sys/net80211/ieee80211_input.c:1.107
--- src/sys/net80211/ieee80211_input.c:1.106 Tue Jan 16 16:54:54 2018
+++ src/sys/net80211/ieee80211_input.c Tue Jan 16 18:42:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_input.c,v 1.106 2018/01/16 16:54:54 maxv Exp $ */
+/* $NetBSD: ieee80211_input.c,v 1.107 2018/01/16 18:42:43 maxv Exp $ */
/*
* Copyright (c) 2001 Atsushi Onoe
@@ -37,7 +37,7 @@
__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.81 2005/08/10 16:22:29 sam Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_input.c,v 1.106 2018/01/16 16:54:54 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_input.c,v 1.107 2018/01/16 18:42:43 maxv Exp $");
#endif
#ifdef _KERNEL_OPT
@@ -1931,7 +1931,7 @@ ieee80211_update_adhoc_node(struct ieee8
ieee80211_init_neighbor(ic, ni, wh, scan, 0);
} else {
/* Record TSF for potential resync. */
- memcpy(ni->ni_tstamp.data, scan->tstamp, sizeof(ni->ni_tstamp));
+ memcpy(ni->ni_tstamp.data, scan->sp_tstamp, sizeof(ni->ni_tstamp));
}
ni->ni_rssi = rssi;
@@ -2046,11 +2046,11 @@ ieee80211_recv_mgmt_beacon(struct ieee80
*/
IEEE80211_VERIFY_LENGTH(efrm - frm, 12);
memset(&scan, 0, sizeof(scan));
- scan.tstamp = frm; frm += 8;
- scan.bintval = le16toh(*(u_int16_t *)frm); frm += 2;
- scan.capinfo = le16toh(*(u_int16_t *)frm); frm += 2;
- scan.bchan = ieee80211_chan2ieee(ic, ic->ic_curchan);
- scan.chan = scan.bchan;
+ scan.sp_tstamp = frm; frm += 8;
+ scan.sp_bintval = le16toh(*(u_int16_t *)frm); frm += 2;
+ scan.sp_capinfo = le16toh(*(u_int16_t *)frm); frm += 2;
+ scan.sp_bchan = ieee80211_chan2ieee(ic, ic->ic_curchan);
+ scan.sp_chan = scan.sp_bchan;
while (frm + 1 < efrm) {
IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1] + 2);
@@ -2058,22 +2058,22 @@ ieee80211_recv_mgmt_beacon(struct ieee80
switch (*frm) {
case IEEE80211_ELEMID_SSID:
/* no length check needed */
- scan.ssid = frm;
+ scan.sp_ssid = frm;
break;
case IEEE80211_ELEMID_RATES:
/* no length check needed */
- scan.rates = frm;
+ scan.sp_rates = frm;
break;
case IEEE80211_ELEMID_COUNTRY:
/* XXX: we don't do anything with this? */
- scan.country = frm;
+ scan.sp_country = frm;
break;
case IEEE80211_ELEMID_FHPARMS:
IEEE80211_VERIFY_LENGTH(frm[1], 5);
if (ic->ic_phytype == IEEE80211_T_FH) {
- scan.fhdwell = LE_READ_2(&frm[2]);
- scan.chan = IEEE80211_FH_CHAN(frm[4], frm[5]);
- scan.fhindex = frm[6];
+ scan.sp_fhdwell = LE_READ_2(&frm[2]);
+ scan.sp_chan = IEEE80211_FH_CHAN(frm[4], frm[5]);
+ scan.sp_fhindex = frm[6];
}
break;
case IEEE80211_ELEMID_DSPARMS:
@@ -2083,13 +2083,13 @@ ieee80211_recv_mgmt_beacon(struct ieee80
*/
IEEE80211_VERIFY_LENGTH(frm[1], 1);
if (ic->ic_phytype != IEEE80211_T_FH)
- scan.chan = frm[2];
+ scan.sp_chan = frm[2];
break;
case IEEE80211_ELEMID_TIM:
/* XXX ATIM? */
IEEE80211_VERIFY_LENGTH(frm[1], 5);
- scan.tim = frm;
- scan.timoff = frm - mtod(m0, u_int8_t *);
+ scan.sp_tim = frm;
+ scan.sp_timoff = frm - mtod(m0, u_int8_t *);
break;
case IEEE80211_ELEMID_IBSSPARMS:
break;
@@ -2100,7 +2100,7 @@ ieee80211_recv_mgmt_beacon(struct ieee80
ic->ic_stats.is_rx_elem_toobig++;
break;
}
- scan.xrates = frm;
+ scan.sp_xrates = frm;
break;
case IEEE80211_ELEMID_ERP:
if (frm[1] != 1) {
@@ -2109,18 +2109,18 @@ ieee80211_recv_mgmt_beacon(struct ieee80
ic->ic_stats.is_rx_elem_toobig++;
break;
}
- scan.erp = frm[2];
+ scan.sp_erp = frm[2];
break;
case IEEE80211_ELEMID_RSN:
/* no length check needed */
- scan.wpa = frm;
+ scan.sp_wpa = frm;
break;
case IEEE80211_ELEMID_VENDOR:
/* no length check needed */
if (iswpaoui(frm))
- scan.wpa = frm;
+ scan.sp_wpa = frm;
else if (iswmeparam(frm) || iswmeinfo(frm))
- scan.wme = frm;
+ scan.sp_wme = frm;
/* XXX Atheros OUI support */
break;
default:
@@ -2133,24 +2133,24 @@ ieee80211_recv_mgmt_beacon(struct ieee80
frm += frm[1] + 2;
}
- IEEE80211_VERIFY_ELEMENT(scan.rates, IEEE80211_RATE_MAXSIZE);
- IEEE80211_VERIFY_ELEMENT(scan.ssid, IEEE80211_NWID_LEN);
+ IEEE80211_VERIFY_ELEMENT(scan.sp_rates, IEEE80211_RATE_MAXSIZE);
+ IEEE80211_VERIFY_ELEMENT(scan.sp_ssid, IEEE80211_NWID_LEN);
if (
#if IEEE80211_CHAN_MAX < 255
- scan.chan > IEEE80211_CHAN_MAX ||
+ scan.sp_chan > IEEE80211_CHAN_MAX ||
#endif
- isclr(ic->ic_chan_active, scan.chan)) {
+ isclr(ic->ic_chan_active, scan.sp_chan)) {
IEEE80211_DISCARD(ic,
IEEE80211_MSG_ELEMID | IEEE80211_MSG_INPUT,
wh, ieee80211_mgt_subtype_name[subtype >>
IEEE80211_FC0_SUBTYPE_SHIFT],
- "invalid channel %u", scan.chan);
+ "invalid channel %u", scan.sp_chan);
ic->ic_stats.is_rx_badchan++;
return;
}
- if (scan.chan != scan.bchan &&
+ if (scan.sp_chan != scan.sp_bchan &&
ic->ic_phytype != IEEE80211_T_FH) {
/*
* Frame was received on a channel different from the
@@ -2166,25 +2166,25 @@ ieee80211_recv_mgmt_beacon(struct ieee80
IEEE80211_MSG_ELEMID | IEEE80211_MSG_INPUT,
wh, ieee80211_mgt_subtype_name[subtype >>
IEEE80211_FC0_SUBTYPE_SHIFT],
- "for off-channel %u", scan.chan);
+ "for off-channel %u", scan.sp_chan);
ic->ic_stats.is_rx_chanmismatch++;
return;
}
- if (!(IEEE80211_BINTVAL_MIN <= scan.bintval &&
- scan.bintval <= IEEE80211_BINTVAL_MAX)) {
+ if (!(IEEE80211_BINTVAL_MIN <= scan.sp_bintval &&
+ scan.sp_bintval <= IEEE80211_BINTVAL_MAX)) {
IEEE80211_DISCARD(ic,
IEEE80211_MSG_ELEMID | IEEE80211_MSG_INPUT,
wh, ieee80211_mgt_subtype_name[subtype >>
IEEE80211_FC0_SUBTYPE_SHIFT],
- "bogus beacon interval", scan.bintval);
+ "bogus beacon interval", scan.sp_bintval);
ic->ic_stats.is_rx_badbintval++;
return;
}
if (ni != ic->ic_bss) {
ni = ieee80211_refine_node_for_beacon(ic, ni,
- &ic->ic_channels[scan.chan], scan.ssid);
+ &ic->ic_channels[scan.sp_chan], scan.sp_ssid);
}
/*
@@ -2206,29 +2206,29 @@ ieee80211_recv_mgmt_beacon(struct ieee80
((ic->ic_flags & IEEE80211_F_SCAN) == 0 ||
IEEE80211_ADDR_EQ(wh->i_addr2, ni->ni_bssid))) {
/* record tsf of last beacon */
- memcpy(ni->ni_tstamp.data, scan.tstamp, sizeof(ni->ni_tstamp));
+ memcpy(ni->ni_tstamp.data, scan.sp_tstamp, sizeof(ni->ni_tstamp));
- if (ni->ni_erp != scan.erp) {
+ if (ni->ni_erp != scan.sp_erp) {
IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC,
"[%s] erp change: was 0x%x, now 0x%x\n",
ether_snprintf(ebuf, sizeof(ebuf),
- wh->i_addr2), ni->ni_erp, scan.erp);
+ wh->i_addr2), ni->ni_erp, scan.sp_erp);
if (ic->ic_curmode == IEEE80211_MODE_11G &&
(ni->ni_erp & IEEE80211_ERP_USE_PROTECTION))
ic->ic_flags |= IEEE80211_F_USEPROT;
else
ic->ic_flags &= ~IEEE80211_F_USEPROT;
- ni->ni_erp = scan.erp;
+ ni->ni_erp = scan.sp_erp;
/* XXX statistic */
}
- if ((ni->ni_capinfo ^ scan.capinfo) & IEEE80211_CAPINFO_SHORT_SLOTTIME) {
+ if ((ni->ni_capinfo ^ scan.sp_capinfo) & IEEE80211_CAPINFO_SHORT_SLOTTIME) {
IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC,
"[%s] capabilities change: before 0x%x,"
" now 0x%x\n",
ether_snprintf(ebuf, sizeof(ebuf),
wh->i_addr2),
- ni->ni_capinfo, scan.capinfo);
+ ni->ni_capinfo, scan.sp_capinfo);
/*
* NB: we assume short preamble doesn't
* change dynamically
@@ -2236,18 +2236,18 @@ ieee80211_recv_mgmt_beacon(struct ieee80
ieee80211_set_shortslottime(ic,
ic->ic_curmode == IEEE80211_MODE_11A ||
(ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME));
- ni->ni_capinfo = scan.capinfo;
+ ni->ni_capinfo = scan.sp_capinfo;
/* XXX statistic */
}
- if (scan.wme != NULL && (ni->ni_flags & IEEE80211_NODE_QOS) &&
- ieee80211_parse_wmeparams(ic, scan.wme, wh) > 0) {
+ if (scan.sp_wme != NULL && (ni->ni_flags & IEEE80211_NODE_QOS) &&
+ ieee80211_parse_wmeparams(ic, scan.sp_wme, wh) > 0) {
ieee80211_wme_updateparams(ic);
}
- if (scan.tim != NULL) {
+ if (scan.sp_tim != NULL) {
struct ieee80211_tim_ie *ie =
- (struct ieee80211_tim_ie *)scan.tim;
+ (struct ieee80211_tim_ie *)scan.sp_tim;
ni->ni_dtim_count = ie->tim_count;
ni->ni_dtim_period = ie->tim_period;
@@ -2282,7 +2282,7 @@ ieee80211_recv_mgmt_beacon(struct ieee80
return;
}
- if (scan.capinfo & IEEE80211_CAPINFO_IBSS) {
+ if (scan.sp_capinfo & IEEE80211_CAPINFO_IBSS) {
ieee80211_update_adhoc_node(ic, ni, wh, &scan, rssi, rstamp);
}
}
Index: src/sys/net80211/ieee80211_node.c
diff -u src/sys/net80211/ieee80211_node.c:1.72 src/sys/net80211/ieee80211_node.c:1.73
--- src/sys/net80211/ieee80211_node.c:1.72 Tue Sep 27 20:20:06 2016
+++ src/sys/net80211/ieee80211_node.c Tue Jan 16 18:42:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_node.c,v 1.72 2016/09/27 20:20:06 christos Exp $ */
+/* $NetBSD: ieee80211_node.c,v 1.73 2018/01/16 18:42:43 maxv Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,7 +36,7 @@
__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.65 2005/08/13 17:50:21 sam Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_node.c,v 1.72 2016/09/27 20:20:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_node.c,v 1.73 2018/01/16 18:42:43 maxv Exp $");
#endif
#ifdef _KERNEL_OPT
@@ -1196,22 +1196,23 @@ dump_probe_beacon(u_int8_t subtype, int
printf("[%s] %s%s on chan %u (bss chan %u) ",
ether_sprintf(mac), isnew ? "new " : "",
ieee80211_mgt_subtype_name[subtype >> IEEE80211_FC0_SUBTYPE_SHIFT],
- sp->chan, sp->bchan);
- ieee80211_print_essid(sp->ssid + 2, sp->ssid[1]);
+ sp->sp_chan, sp->sp_bchan);
+ ieee80211_print_essid(sp->sp_ssid + 2, sp->sp_ssid[1]);
printf("\n");
if (isnew) {
printf("[%s] caps 0x%x bintval %u erp 0x%x",
- ether_sprintf(mac), sp->capinfo, sp->bintval, sp->erp);
- if (sp->country != NULL) {
+ ether_sprintf(mac), sp->sp_capinfo, sp->sp_bintval,
+ sp->sp_erp);
+ if (sp->sp_country != NULL) {
#ifdef __FreeBSD__
printf(" country info %*D",
- sp->country[1], sp->country+2, " ");
+ sp->sp_country[1], sp->sp_country+2, " ");
#else
int i;
printf(" country info");
- for (i = 0; i < sp->country[1]; i++)
- printf(" %02x", sp->country[i+2]);
+ for (i = 0; i < sp->sp_country[1]; i++)
+ printf(" %02x", sp->sp_country[i+2]);
#endif
}
printf("\n");
@@ -1269,26 +1270,26 @@ ieee80211_add_scan(struct ieee80211com *
dump_probe_beacon(subtype, newnode, wh->i_addr2, sp);
#endif
/* XXX ap beaconing multiple ssid w/ same bssid */
- if (sp->ssid[1] != 0 &&
+ if (sp->sp_ssid[1] != 0 &&
(ISPROBE(subtype) || ni->ni_esslen == 0)) {
- ni->ni_esslen = sp->ssid[1];
+ ni->ni_esslen = sp->sp_ssid[1];
memset(ni->ni_essid, 0, sizeof(ni->ni_essid));
- memcpy(ni->ni_essid, sp->ssid + 2, sp->ssid[1]);
+ memcpy(ni->ni_essid, sp->sp_ssid + 2, sp->sp_ssid[1]);
}
ni->ni_scangen = ic->ic_scan.nt_scangen;
IEEE80211_ADDR_COPY(ni->ni_bssid, wh->i_addr3);
ni->ni_rssi = rssi;
ni->ni_rstamp = rstamp;
- memcpy(ni->ni_tstamp.data, sp->tstamp, sizeof(ni->ni_tstamp));
- ni->ni_intval = sp->bintval;
- ni->ni_capinfo = sp->capinfo;
- ni->ni_chan = &ic->ic_channels[sp->chan];
- ni->ni_fhdwell = sp->fhdwell;
- ni->ni_fhindex = sp->fhindex;
- ni->ni_erp = sp->erp;
- if (sp->tim != NULL) {
+ memcpy(ni->ni_tstamp.data, sp->sp_tstamp, sizeof(ni->ni_tstamp));
+ ni->ni_intval = sp->sp_bintval;
+ ni->ni_capinfo = sp->sp_capinfo;
+ ni->ni_chan = &ic->ic_channels[sp->sp_chan];
+ ni->ni_fhdwell = sp->sp_fhdwell;
+ ni->ni_fhindex = sp->sp_fhindex;
+ ni->ni_erp = sp->sp_erp;
+ if (sp->sp_tim != NULL) {
struct ieee80211_tim_ie *ie =
- (struct ieee80211_tim_ie *) sp->tim;
+ (struct ieee80211_tim_ie *)sp->sp_tim;
ni->ni_dtim_count = ie->tim_count;
ni->ni_dtim_period = ie->tim_period;
@@ -1299,16 +1300,17 @@ ieee80211_add_scan(struct ieee80211com *
* use by hardware and/or to speedup software
* processing of beacon frames.
*/
- ni->ni_timoff = sp->timoff;
+ ni->ni_timoff = sp->sp_timoff;
/*
* Record optional information elements that might be
* used by applications or drivers.
*/
- saveie(&ni->ni_wme_ie, sp->wme);
- saveie(&ni->ni_wpa_ie, sp->wpa);
+ saveie(&ni->ni_wme_ie, sp->sp_wme);
+ saveie(&ni->ni_wpa_ie, sp->sp_wpa);
/* NB: must be after ni_chan is setup */
- ieee80211_setup_rates(ni, sp->rates, sp->xrates, IEEE80211_R_DOSORT);
+ ieee80211_setup_rates(ni, sp->sp_rates, sp->sp_xrates,
+ IEEE80211_R_DOSORT);
if (!newnode)
ieee80211_free_node(ni);
@@ -1320,24 +1322,24 @@ ieee80211_init_neighbor(struct ieee80211
const struct ieee80211_frame *wh, const struct ieee80211_scanparams *sp,
int isnew)
{
- ni->ni_esslen = sp->ssid[1];
- memcpy(ni->ni_essid, sp->ssid + 2, sp->ssid[1]);
+ ni->ni_esslen = sp->sp_ssid[1];
+ memcpy(ni->ni_essid, sp->sp_ssid + 2, sp->sp_ssid[1]);
IEEE80211_ADDR_COPY(ni->ni_bssid, wh->i_addr3);
- memcpy(ni->ni_tstamp.data, sp->tstamp, sizeof(ni->ni_tstamp));
- ni->ni_intval = sp->bintval;
- ni->ni_capinfo = sp->capinfo;
+ memcpy(ni->ni_tstamp.data, sp->sp_tstamp, sizeof(ni->ni_tstamp));
+ ni->ni_intval = sp->sp_bintval;
+ ni->ni_capinfo = sp->sp_capinfo;
ni->ni_chan = ic->ic_bss->ni_chan;
- ni->ni_fhdwell = sp->fhdwell;
- ni->ni_fhindex = sp->fhindex;
- ni->ni_erp = sp->erp;
- ni->ni_timoff = sp->timoff;
- if (sp->wme != NULL)
- ieee80211_saveie(&ni->ni_wme_ie, sp->wme);
- if (sp->wpa != NULL)
- ieee80211_saveie(&ni->ni_wpa_ie, sp->wpa);
+ ni->ni_fhdwell = sp->sp_fhdwell;
+ ni->ni_fhindex = sp->sp_fhindex;
+ ni->ni_erp = sp->sp_erp;
+ ni->ni_timoff = sp->sp_timoff;
+ if (sp->sp_wme != NULL)
+ ieee80211_saveie(&ni->ni_wme_ie, sp->sp_wme);
+ if (sp->sp_wpa != NULL)
+ ieee80211_saveie(&ni->ni_wpa_ie, sp->sp_wpa);
/* NB: must be after ni_chan is setup */
- ieee80211_setup_rates(ni, sp->rates, sp->xrates,
+ ieee80211_setup_rates(ni, sp->sp_rates, sp->sp_xrates,
IEEE80211_R_DODEL | IEEE80211_R_DONEGO | IEEE80211_R_DOSORT);
if (ic->ic_newassoc != NULL)
Index: src/sys/net80211/ieee80211_node.h
diff -u src/sys/net80211/ieee80211_node.h:1.27 src/sys/net80211/ieee80211_node.h:1.28
--- src/sys/net80211/ieee80211_node.h:1.27 Fri Apr 8 14:30:47 2016
+++ src/sys/net80211/ieee80211_node.h Tue Jan 16 18:42:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_node.h,v 1.27 2016/04/08 14:30:47 roy Exp $ */
+/* $NetBSD: ieee80211_node.h,v 1.28 2018/01/16 18:42:43 maxv Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -296,22 +296,22 @@ u_int8_t ieee80211_getrssi(struct ieee80
* All multi-byte values must be in host byte order.
*/
struct ieee80211_scanparams {
- u_int16_t capinfo; /* 802.11 capabilities */
- u_int16_t fhdwell; /* FHSS dwell interval */
- u_int8_t chan; /* */
- u_int8_t bchan;
- u_int8_t fhindex;
- u_int8_t erp;
- u_int16_t bintval;
- u_int8_t timoff;
- u_int8_t *tim;
- u_int8_t *tstamp;
- u_int8_t *country;
- u_int8_t *ssid;
- u_int8_t *rates;
- u_int8_t *xrates;
- u_int8_t *wpa;
- u_int8_t *wme;
+ u_int16_t sp_capinfo; /* 802.11 capabilities */
+ u_int16_t sp_fhdwell; /* FHSS dwell interval */
+ u_int8_t sp_chan; /* */
+ u_int8_t sp_bchan;
+ u_int8_t sp_fhindex;
+ u_int8_t sp_erp;
+ u_int16_t sp_bintval;
+ u_int8_t sp_timoff;
+ u_int8_t *sp_tim;
+ u_int8_t *sp_tstamp;
+ u_int8_t *sp_country;
+ u_int8_t *sp_ssid;
+ u_int8_t *sp_rates;
+ u_int8_t *sp_xrates;
+ u_int8_t *sp_wpa;
+ u_int8_t *sp_wme;
};
/*
