Page MenuHomeFreeBSD

D61123.1795164590.diff
No OneTemporary

Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None

D61123.1795164590.diff

diff --git a/sys/dev/iwx/if_iwx.c b/sys/dev/iwx/if_iwx.c
--- a/sys/dev/iwx/if_iwx.c
+++ b/sys/dev/iwx/if_iwx.c
@@ -4471,6 +4471,9 @@
uint8_t mcs, rate;
tap->wr_flags = 0;
+ /* Enabled automatically in promiscuous mode. */
+ if (vap->iv_opmode == IEEE80211_M_MONITOR)
+ tap->wr_flags |= IEEE80211_RADIOTAP_F_FCS;
if (is_shortpre)
tap->wr_flags |= IEEE80211_RADIOTAP_F_SHORTPRE;
tap->wr_chan_freq =
@@ -4547,7 +4550,8 @@
IWX_UNLOCK(sc);
if (ni == NULL) {
- if (ieee80211_input_mimo_all(ic, m) == -1)
+ if (ieee80211_input_mimo_all(ic, m) == -1 &&
+ vap->iv_opmode != IEEE80211_M_MONITOR)
printf("%s:%d input_all returned -1\n", __func__, __LINE__);
} else {
@@ -4755,8 +4759,6 @@
return;
}
- ieee80211_add_rx_params(m, &rxs);
-
#if 0
if (iwx_rx_reorder(sc, m, chanidx, desc,
(phy_info & IWX_RX_MPDU_PHY_SHORT_PREAMBLE),
@@ -7614,7 +7616,7 @@
if (ic->ic_opmode == IEEE80211_M_MONITOR) {
err = iwx_phy_ctxt_update(sc, &sc->sc_phyctxt[0],
- ic->ic_bsschan, 1, 1, 0, IEEE80211_HTOP0_SCO_SCN,
+ ic->ic_curchan, 1, 1, 0, IEEE80211_HTOP0_SCO_SCN,
IEEE80211_VHTOP0_CHAN_WIDTH_HT);
if (err)
return err;
@@ -8124,7 +8126,11 @@
break;
case IEEE80211_S_RUN:
- err = iwx_run(vap, sc);
+ if (ic->ic_opmode == IEEE80211_M_MONITOR) {
+ err = iwx_auth(vap, sc);
+ } else {
+ err = iwx_run(vap, sc);
+ }
break;
default:
break;

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 20, 8:49 AM (21 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41352672
Default Alt Text
D61123.1795164590.diff (1 KB)

Event Timeline