diff options
| author | sam <sam@FreeBSD.org> | 2004-04-02 22:54:07 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2004-04-02 22:54:07 +0000 |
| commit | f57cb8d81b0b07bf0cf87ea720d3ea41b0c53283 (patch) | |
| tree | 74e66f15a29e0b1fccfdedd6f1076ebd97dc128d /sys/net80211 | |
| parent | 41b9a21d19c59421799e643fe9fdadb2389b851c (diff) | |
| download | FreeBSD-src-f57cb8d81b0b07bf0cf87ea720d3ea41b0c53283.zip FreeBSD-src-f57cb8d81b0b07bf0cf87ea720d3ea41b0c53283.tar.gz | |
when processing beacon/probe response frames capture "is probe" in a
variable to improve code legibility since we're going to use it more
in forthcoming mods
Obtained from: madwifi
Diffstat (limited to 'sys/net80211')
| -rw-r--r-- | sys/net80211/ieee80211_input.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c index cedbfe9..035899c5 100644 --- a/sys/net80211/ieee80211_input.c +++ b/sys/net80211/ieee80211_input.c @@ -548,7 +548,6 @@ ieee80211_recv_mgmt(struct ieee80211com *ic, struct mbuf *m0, struct ieee80211_node *ni, int subtype, int rssi, u_int32_t rstamp) { -#define ISPROBE(_st) ((_st) == IEEE80211_FC0_SUBTYPE_PROBE_RESP) struct ifnet *ifp = &ic->ic_if; struct ieee80211_frame *wh; u_int8_t *frm, *efrm; @@ -564,12 +563,14 @@ ieee80211_recv_mgmt(struct ieee80211com *ic, struct mbuf *m0, u_int8_t *tstamp, *bintval, *capinfo, *country; u_int8_t chan, bchan, fhindex, erp; u_int16_t fhdwell; + int isprobe; if (ic->ic_opmode != IEEE80211_M_IBSS && ic->ic_state != IEEE80211_S_SCAN) { /* XXX: may be useful for background scan */ return; } + isprobe = (subtype == IEEE80211_FC0_SUBTYPE_PROBE_RESP); /* * beacon/probe response frame format @@ -653,7 +654,7 @@ ieee80211_recv_mgmt(struct ieee80211com *ic, struct mbuf *m0, isclr(ic->ic_chan_active, chan)) { IEEE80211_DPRINTF(("%s: ignore %s with invalid channel " "%u\n", __func__, - ISPROBE(subtype) ? "probe response" : "beacon", + isprobe ? "probe response" : "beacon", chan)); ic->ic_stats.is_rx_badchan++; return; @@ -671,7 +672,7 @@ ieee80211_recv_mgmt(struct ieee80211com *ic, struct mbuf *m0, */ IEEE80211_DPRINTF(("%s: ignore %s on channel %u marked " "for channel %u\n", __func__, - ISPROBE(subtype) ? "probe response" : "beacon", + isprobe ? "probe response" : "beacon", bchan, chan)); ic->ic_stats.is_rx_chanmismatch++; return; @@ -694,7 +695,7 @@ ieee80211_recv_mgmt(struct ieee80211com *ic, struct mbuf *m0, (ni == NULL || ic->ic_state == IEEE80211_S_SCAN)) { printf("%s: %s%s on chan %u (bss chan %u) ", __func__, (ni == NULL ? "new " : ""), - ISPROBE(subtype) ? "probe response" : "beacon", + isprobe ? "probe response" : "beacon", chan, bchan); ieee80211_print_essid(ssid + 2, ssid[1]); printf(" from %s\n", ether_sprintf(wh->i_addr2)); @@ -715,7 +716,7 @@ ieee80211_recv_mgmt(struct ieee80211com *ic, struct mbuf *m0, ni->ni_esslen = ssid[1]; memset(ni->ni_essid, 0, sizeof(ni->ni_essid)); memcpy(ni->ni_essid, ssid + 2, ssid[1]); - } else if (ssid[1] != 0 && ISPROBE(subtype)) { + } else if (ssid[1] != 0 && isprobe) { /* * Update ESSID at probe response to adopt hidden AP by * Lucent/Cisco, which announces null ESSID in beacon. @@ -1168,7 +1169,6 @@ ieee80211_recv_mgmt(struct ieee80211com *ic, struct mbuf *m0, ic->ic_stats.is_rx_badsubtype++; break; } -#undef ISPROBE } #undef IEEE80211_VERIFY_LENGTH #undef IEEE80211_VERIFY_ELEMENT |
