Deleted Added
full compact
if_ipw.c (158651) if_ipw.c (159180)
1/* $FreeBSD: head/sys/dev/ipw/if_ipw.c 158651 2006-05-16 14:37:58Z phk $ */
1/* $FreeBSD: head/sys/dev/ipw/if_ipw.c 159180 2006-06-02 19:59:33Z csjp $ */
2
3/*-
4 * Copyright (c) 2004-2006
5 * Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions
9 * are met:

--- 13 unchanged lines hidden (view full) ---

23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 */
29
30#include <sys/cdefs.h>
2
3/*-
4 * Copyright (c) 2004-2006
5 * Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions
9 * are met:

--- 13 unchanged lines hidden (view full) ---

23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 */
29
30#include <sys/cdefs.h>
31__FBSDID("$FreeBSD: head/sys/dev/ipw/if_ipw.c 158651 2006-05-16 14:37:58Z phk $");
31__FBSDID("$FreeBSD: head/sys/dev/ipw/if_ipw.c 159180 2006-06-02 19:59:33Z csjp $");
32
33/*-
34 * Intel(R) PRO/Wireless 2100 MiniPCI driver
35 * http://www.intel.com/network/connectivity/products/wireless/prowireless_mobile.htm
36 */
37
38#include <sys/param.h>
39#include <sys/sysctl.h>

--- 1009 unchanged lines hidden (view full) ---

1049 m = sbuf->m;
1050 sbuf->m = mnew;
1051 sbd->bd->physaddr = htole32(physaddr);
1052
1053 /* finalize mbuf */
1054 m->m_pkthdr.rcvif = ifp;
1055 m->m_pkthdr.len = m->m_len = le32toh(status->len);
1056
32
33/*-
34 * Intel(R) PRO/Wireless 2100 MiniPCI driver
35 * http://www.intel.com/network/connectivity/products/wireless/prowireless_mobile.htm
36 */
37
38#include <sys/param.h>
39#include <sys/sysctl.h>

--- 1009 unchanged lines hidden (view full) ---

1049 m = sbuf->m;
1050 sbuf->m = mnew;
1051 sbd->bd->physaddr = htole32(physaddr);
1052
1053 /* finalize mbuf */
1054 m->m_pkthdr.rcvif = ifp;
1055 m->m_pkthdr.len = m->m_len = le32toh(status->len);
1056
1057 if (sc->sc_drvbpf != NULL) {
1057 if (bpf_peers_present(sc->sc_drvbpf)) {
1058 struct ipw_rx_radiotap_header *tap = &sc->sc_rxtap;
1059
1060 tap->wr_flags = 0;
1061 tap->wr_antsignal = status->rssi;
1062 tap->wr_chan_freq = htole16(ic->ic_curchan->ic_freq);
1063 tap->wr_chan_flags = htole16(ic->ic_curchan->ic_flags);
1064
1065 bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_rxtap_len, m);

--- 257 unchanged lines hidden (view full) ---

1323 m_freem(m0);
1324 return ENOBUFS;
1325 }
1326
1327 /* packet header may have moved, reset our local pointer */
1328 wh = mtod(m0, struct ieee80211_frame *);
1329 }
1330
1058 struct ipw_rx_radiotap_header *tap = &sc->sc_rxtap;
1059
1060 tap->wr_flags = 0;
1061 tap->wr_antsignal = status->rssi;
1062 tap->wr_chan_freq = htole16(ic->ic_curchan->ic_freq);
1063 tap->wr_chan_flags = htole16(ic->ic_curchan->ic_flags);
1064
1065 bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_rxtap_len, m);

--- 257 unchanged lines hidden (view full) ---

1323 m_freem(m0);
1324 return ENOBUFS;
1325 }
1326
1327 /* packet header may have moved, reset our local pointer */
1328 wh = mtod(m0, struct ieee80211_frame *);
1329 }
1330
1331 if (sc->sc_drvbpf != NULL) {
1331 if (bpf_peers_present(sc->sc_drvbpf)) {
1332 struct ipw_tx_radiotap_header *tap = &sc->sc_txtap;
1333
1334 tap->wt_flags = 0;
1335 tap->wt_chan_freq = htole16(ic->ic_curchan->ic_freq);
1336 tap->wt_chan_flags = htole16(ic->ic_curchan->ic_flags);
1337
1338 bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0);
1339 }

--- 874 unchanged lines hidden ---
1332 struct ipw_tx_radiotap_header *tap = &sc->sc_txtap;
1333
1334 tap->wt_flags = 0;
1335 tap->wt_chan_freq = htole16(ic->ic_curchan->ic_freq);
1336 tap->wt_chan_flags = htole16(ic->ic_curchan->ic_flags);
1337
1338 bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0);
1339 }

--- 874 unchanged lines hidden ---