Deleted Added
full compact
if_ath.c (227365) if_ath.c (227410)
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 227365 2011-11-08 22:50:28Z adrian $");
31__FBSDID("$FreeBSD: head/sys/dev/ath/if_ath.c 227410 2011-11-09 22:39:44Z 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

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

60#include <sys/callout.h>
61#include <sys/bus.h>
62#include <sys/endian.h>
63#include <sys/kthread.h>
64#include <sys/taskqueue.h>
65#include <sys/priv.h>
66#include <sys/module.h>
67#include <sys/ktr.h>
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

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

60#include <sys/callout.h>
61#include <sys/bus.h>
62#include <sys/endian.h>
63#include <sys/kthread.h>
64#include <sys/taskqueue.h>
65#include <sys/priv.h>
66#include <sys/module.h>
67#include <sys/ktr.h>
68#include <sys/smp.h> /* for mp_ncpus */
68
69#include <machine/bus.h>
70
71#include <net/if.h>
72#include <net/if_dl.h>
73#include <net/if_media.h>
74#include <net/if_types.h>
75#include <net/if_arp.h>

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

670 ic->ic_txstream = txs;
671 ic->ic_rxstream = rxs;
672
673 device_printf(sc->sc_dev, "[HT] %d RX streams; %d TX streams\n", rxs, txs);
674 }
675#endif
676
677 /*
69
70#include <machine/bus.h>
71
72#include <net/if.h>
73#include <net/if_dl.h>
74#include <net/if_media.h>
75#include <net/if_types.h>
76#include <net/if_arp.h>

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

671 ic->ic_txstream = txs;
672 ic->ic_rxstream = rxs;
673
674 device_printf(sc->sc_dev, "[HT] %d RX streams; %d TX streams\n", rxs, txs);
675 }
676#endif
677
678 /*
679 * Check if the hardware requires PCI register serialisation.
680 * Some of the Owl based MACs require this.
681 */
682 if (mp_ncpus > 1 &&
683 ath_hal_getcapability(ah, HAL_CAP_SERIALISE_WAR,
684 0, NULL) == HAL_OK) {
685 sc->sc_ah->ah_config.ah_serialise_reg_war = 1;
686 device_printf(sc->sc_dev, "Enabling register serialisation\n");
687 }
688
689 /*
678 * Indicate we need the 802.11 header padded to a
679 * 32-bit boundary for 4-address and QoS frames.
680 */
681 ic->ic_flags |= IEEE80211_F_DATAPAD;
682
683 /*
684 * Query the hal about antenna support.
685 */

--- 5616 unchanged lines hidden ---
690 * Indicate we need the 802.11 header padded to a
691 * 32-bit boundary for 4-address and QoS frames.
692 */
693 ic->ic_flags |= IEEE80211_F_DATAPAD;
694
695 /*
696 * Query the hal about antenna support.
697 */

--- 5616 unchanged lines hidden ---