Re: kern/34477

["Jared D. McNeill" <jmcneill%invisible.ca@localhost>]

The following reply was made to PR kern/34477; it has been noted by GNATS.

From: "Jared D. McNeill" <jmcneill%invisible.ca@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: kern-bug-people%netbsd.org@localhost, gnats-admin%netbsd.org@localhost, 
 netbsd-bugs%netbsd.org@localhost, veider%weirdzone.org@localhost
Subject: Re: kern/34477
Date: Sun, 25 May 2008 18:10:09 -0400

 This is a multi-part message in MIME format.
 --------------060706030005000502070007
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Please try the attached patch.
 
 Cheers,
 Jared
 
 
 --------------060706030005000502070007
 Content-Type: text/plain;
  name="ipw.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="ipw.patch"
 
 Index: if_ipw.c
 ===================================================================
 RCS file: /cvsroot/src/sys/dev/pci/if_ipw.c,v
 retrieving revision 1.39
 diff -u -r1.39 if_ipw.c
 --- if_ipw.c   10 Apr 2008 19:13:37 -0000      1.39
 +++ if_ipw.c   25 May 2008 22:09:14 -0000
 @@ -1052,8 +1052,13 @@
  
                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);
 +              if (ic->ic_bss->ni_chan != IEEE80211_CHAN_ANYC) {
 +                      tap->wr_chan_freq =
 +                          htole16(ic->ic_bss->ni_chan->ic_freq);
 +                      tap->wr_chan_flags =
 +                          htole16(ic->ic_bss->ni_chan->ic_flags);
 +              } else
 +                      tap->wr_chan_freq = tap->wr_chan_flags = 0;
  
                bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_rxtap_len, m);
        }
 @@ -1326,8 +1331,13 @@
                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);
 +              if (ic->ic_bss->ni_chan != IEEE80211_CHAN_ANYC) {
 +                      tap->wt_chan_freq =
 +                          htole16(ic->ic_bss->ni_chan->ic_freq);
 +                      tap->wt_chan_flags =
 +                          htole16(ic->ic_bss->ni_chan->ic_flags);
 +              } else
 +                      tap->wt_chan_freq = tap->wt_chan_flags = 0;
  
                bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0);
        }
 
 --------------060706030005000502070007--