diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2005-07-30 18:04:42 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2005-07-30 18:04:42 +0000 |
| commit | e3a9c5f1885b689038a7419f58dbe0c796921e6e (patch) | |
| tree | 575c9ccbaf96cf8ab42762200b35d7e1c58851ab | |
| parent | 41ef8219258fd82c48221c71dc3bb18cffab44e6 (diff) | |
Use ic->ic_ibss_chan instead of ic->ic_bss->ni_chan when filling a
ipw_tx_radiotap_header struct. This fixes a panic I got when using
tcpdump -nvi ipw0 -y ieee802_11_radio.
OK reyk@ damien@
| -rw-r--r-- | sys/dev/pci/if_ipw.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/pci/if_ipw.c b/sys/dev/pci/if_ipw.c index b5d5b49afcd..29e9f806a92 100644 --- a/sys/dev/pci/if_ipw.c +++ b/sys/dev/pci/if_ipw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ipw.c,v 1.48 2005/07/02 23:10:11 brad Exp $ */ +/* $OpenBSD: if_ipw.c,v 1.49 2005/07/30 18:04:41 claudio Exp $ */ /*- * Copyright (c) 2004, 2005 @@ -870,8 +870,8 @@ ipw_data_intr(struct ipw_softc *sc, struct ipw_status *status, tap->wr_flags = 0; tap->wr_antsignal = status->rssi; - tap->wr_chan_freq = htole16(ic->ic_bss->ni_chan->ic_freq); - tap->wr_chan_flags = htole16(ic->ic_bss->ni_chan->ic_flags); + tap->wr_chan_freq = htole16(ic->ic_ibss_chan->ic_freq); + tap->wr_chan_flags = htole16(ic->ic_ibss_chan->ic_flags); M_DUP_PKTHDR(&mb, m); mb.m_data = (caddr_t)tap; @@ -1154,8 +1154,8 @@ ipw_tx_start(struct ifnet *ifp, struct mbuf *m, struct ieee80211_node *ni) struct ipw_tx_radiotap_header *tap = &sc->sc_txtap; tap->wt_flags = 0; - tap->wt_chan_freq = htole16(ic->ic_bss->ni_chan->ic_freq); - tap->wt_chan_flags = htole16(ic->ic_bss->ni_chan->ic_flags); + tap->wt_chan_freq = htole16(ic->ic_ibss_chan->ic_freq); + tap->wt_chan_flags = htole16(ic->ic_ibss_chan->ic_flags); M_DUP_PKTHDR(&mb, m); mb.m_data = (caddr_t)tap; |