Deleted Added
full compact
if_ath.c (237179) if_ath.c (237522)
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.c 237179 2012-06-17 03:08:33Z adrian $");
31__FBSDID("$FreeBSD: head/sys/dev/ath/if_ath.c 237522 2012-06-24 07:01:49Z 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

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

794 ic->ic_addba_response = ath_addba_response;
795 ic->ic_addba_response_timeout = ath_addba_response_timeout;
796 ic->ic_addba_stop = ath_addba_stop;
797 ic->ic_bar_response = ath_bar_response;
798
799 ic->ic_update_chw = ath_update_chw;
800#endif /* ATH_ENABLE_11N */
801
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

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

794 ic->ic_addba_response = ath_addba_response;
795 ic->ic_addba_response_timeout = ath_addba_response_timeout;
796 ic->ic_addba_stop = ath_addba_stop;
797 ic->ic_bar_response = ath_bar_response;
798
799 ic->ic_update_chw = ath_update_chw;
800#endif /* ATH_ENABLE_11N */
801
802#ifdef ATH_ENABLE_RADIOTAP_VENDOR_EXT
803 /*
804 * There's one vendor bitmap entry in the RX radiotap
805 * header; make sure that's taken into account.
806 */
807 ieee80211_radiotap_attachv(ic,
808 &sc->sc_tx_th.wt_ihdr, sizeof(sc->sc_tx_th), 0,
809 ATH_TX_RADIOTAP_PRESENT,
810 &sc->sc_rx_th.wr_ihdr, sizeof(sc->sc_rx_th), 1,
811 ATH_RX_RADIOTAP_PRESENT);
812#else
813 /*
814 * No vendor bitmap/extensions are present.
815 */
802 ieee80211_radiotap_attach(ic,
803 &sc->sc_tx_th.wt_ihdr, sizeof(sc->sc_tx_th),
804 ATH_TX_RADIOTAP_PRESENT,
805 &sc->sc_rx_th.wr_ihdr, sizeof(sc->sc_rx_th),
806 ATH_RX_RADIOTAP_PRESENT);
816 ieee80211_radiotap_attach(ic,
817 &sc->sc_tx_th.wt_ihdr, sizeof(sc->sc_tx_th),
818 ATH_TX_RADIOTAP_PRESENT,
819 &sc->sc_rx_th.wr_ihdr, sizeof(sc->sc_rx_th),
820 ATH_RX_RADIOTAP_PRESENT);
821#endif /* ATH_ENABLE_RADIOTAP_VENDOR_EXT */
807
808 /*
809 * Setup dynamic sysctl's now that country code and
810 * regdomain are available from the hal.
811 */
812 ath_sysctlattach(sc);
813 ath_sysctl_stats_attach(sc);
814 ath_sysctl_hal_attach(sc);

--- 4229 unchanged lines hidden ---
822
823 /*
824 * Setup dynamic sysctl's now that country code and
825 * regdomain are available from the hal.
826 */
827 ath_sysctlattach(sc);
828 ath_sysctl_stats_attach(sc);
829 ath_sysctl_hal_attach(sc);

--- 4229 unchanged lines hidden ---