Deleted Added
full compact
if_ath_rx.c (248142) if_ath_rx.c (248146)
1/*-
2 * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

23 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
25 * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
27 * THE POSSIBILITY OF SUCH DAMAGES.
28 */
29
30#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

23 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
25 * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
27 * THE POSSIBILITY OF SUCH DAMAGES.
28 */
29
30#include <sys/cdefs.h>
31__FBSDID("$FreeBSD: head/sys/dev/ath/if_ath_rx.c 248142 2013-03-11 04:19:10Z adrian $");
31__FBSDID("$FreeBSD: head/sys/dev/ath/if_ath_rx.c 248146 2013-03-11 06:54:58Z adrian $");
32
33/*
34 * Driver for the Atheros Wireless LAN controller.
35 *
36 * This software is derived from work of Atsushi Onoe; his contribution
37 * is greatly appreciated.
38 */
39

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

398 /* evm */
399 sc->sc_rx_th.wr_v.evm[0] = rs->rs_evm0;
400 sc->sc_rx_th.wr_v.evm[1] = rs->rs_evm1;
401 sc->sc_rx_th.wr_v.evm[2] = rs->rs_evm2;
402 /* These are only populated from the AR9300 or later */
403 sc->sc_rx_th.wr_v.evm[3] = rs->rs_evm3;
404 sc->sc_rx_th.wr_v.evm[4] = rs->rs_evm4;
405
32
33/*
34 * Driver for the Atheros Wireless LAN controller.
35 *
36 * This software is derived from work of Atsushi Onoe; his contribution
37 * is greatly appreciated.
38 */
39

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

398 /* evm */
399 sc->sc_rx_th.wr_v.evm[0] = rs->rs_evm0;
400 sc->sc_rx_th.wr_v.evm[1] = rs->rs_evm1;
401 sc->sc_rx_th.wr_v.evm[2] = rs->rs_evm2;
402 /* These are only populated from the AR9300 or later */
403 sc->sc_rx_th.wr_v.evm[3] = rs->rs_evm3;
404 sc->sc_rx_th.wr_v.evm[4] = rs->rs_evm4;
405
406 /* direction */
407 sc->sc_rx_th.wr_v.vh_flags = ATH_VENDOR_PKT_RX;
408
409 /* RX rate */
410 sc->sc_rx_th.wr_v.vh_rx_hwrate = rs->rs_rate;
411
412 /* RX flags */
413 sc->sc_rx_th.wr_v.vh_rs_flags = rs->rs_flags;
414
415 if (rs->rs_isaggr)
416 sc->sc_rx_th.wr_v.vh_flags |= ATH_VENDOR_PKT_ISAGGR;
417 if (rs->rs_moreaggr)
418 sc->sc_rx_th.wr_v.vh_flags |= ATH_VENDOR_PKT_MOREAGGR;
419
406 /* phyerr info */
420 /* phyerr info */
407 if (rs->rs_status & HAL_RXERR_PHY)
421 if (rs->rs_status & HAL_RXERR_PHY) {
408 sc->sc_rx_th.wr_v.vh_phyerr_code = rs->rs_phyerr;
422 sc->sc_rx_th.wr_v.vh_phyerr_code = rs->rs_phyerr;
409 else
423 sc->sc_rx_th.wr_v.vh_flags |= ATH_VENDOR_PKT_RXPHYERR;
424 } else {
410 sc->sc_rx_th.wr_v.vh_phyerr_code = 0xff;
425 sc->sc_rx_th.wr_v.vh_phyerr_code = 0xff;
426 }
411 sc->sc_rx_th.wr_v.vh_rs_status = rs->rs_status;
412 sc->sc_rx_th.wr_v.vh_rssi = rs->rs_rssi;
413}
414#endif /* ATH_ENABLE_RADIOTAP_VENDOR_EXT */
415
416static void
417ath_rx_tap(struct ifnet *ifp, struct mbuf *m,
418 const struct ath_rx_status *rs, u_int64_t tsf, int16_t nf)

--- 769 unchanged lines hidden ---
427 sc->sc_rx_th.wr_v.vh_rs_status = rs->rs_status;
428 sc->sc_rx_th.wr_v.vh_rssi = rs->rs_rssi;
429}
430#endif /* ATH_ENABLE_RADIOTAP_VENDOR_EXT */
431
432static void
433ath_rx_tap(struct ifnet *ifp, struct mbuf *m,
434 const struct ath_rx_status *rs, u_int64_t tsf, int16_t nf)

--- 769 unchanged lines hidden ---