#include <sys/priv.h>
#include <sys/module.h>
#include <sys/ktr.h>
-#include <sys/smp.h> /* for mp_ncpus */
-
-#include <machine/bus.h>
#include <net/if.h>
#include <net/if_var.h>
#include <net/ethernet.h>
#include <net/if_llc.h>
-#include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_regdomain.h>
+#include <netproto/802_11/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_regdomain.h>
#ifdef IEEE80211_SUPPORT_SUPERG
-#include <net80211/ieee80211_superg.h>
+#include <netproto/802_11/ieee80211_superg.h>
#endif
#ifdef IEEE80211_SUPPORT_TDMA
-#include <net80211/ieee80211_tdma.h>
+#include <netproto/802_11/ieee80211_tdma.h>
#endif
#include <net/bpf.h>
#include <netinet/if_ether.h>
#endif
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/ath_hal/ah_devid.h> /* XXX for softled */
-#include <dev/ath/ath_hal/ah_diagcodes.h>
-
-#include <dev/ath/if_ath_debug.h>
-#include <dev/ath/if_ath_misc.h>
-#include <dev/ath/if_ath_tsf.h>
-#include <dev/ath/if_ath_tx.h>
-#include <dev/ath/if_ath_sysctl.h>
-#include <dev/ath/if_ath_led.h>
-#include <dev/ath/if_ath_keycache.h>
-#include <dev/ath/if_ath_rx.h>
-#include <dev/ath/if_ath_rx_edma.h>
-#include <dev/ath/if_ath_tx_edma.h>
-#include <dev/ath/if_ath_beacon.h>
-#include <dev/ath/if_ath_btcoex.h>
-#include <dev/ath/if_ath_spectral.h>
-#include <dev/ath/if_ath_lna_div.h>
-#include <dev/ath/if_athdfs.h>
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath_hal/ah_devid.h> /* XXX for softled */
+#include <dev/netif/ath/ath_hal/ah_diagcodes.h>
+
+#include <dev/netif/ath/ath/if_ath_debug.h>
+#include <dev/netif/ath/ath/if_ath_misc.h>
+#include <dev/netif/ath/ath/if_ath_tsf.h>
+#include <dev/netif/ath/ath/if_ath_tx.h>
+#include <dev/netif/ath/ath/if_ath_sysctl.h>
+#include <dev/netif/ath/ath/if_ath_led.h>
+#include <dev/netif/ath/ath/if_ath_keycache.h>
+#include <dev/netif/ath/ath/if_ath_rx.h>
+#include <dev/netif/ath/ath/if_ath_rx_edma.h>
+#include <dev/netif/ath/ath/if_ath_tx_edma.h>
+#include <dev/netif/ath/ath/if_ath_beacon.h>
+#include <dev/netif/ath/ath/if_ath_btcoex.h>
+#include <dev/netif/ath/ath/if_ath_spectral.h>
+#include <dev/netif/ath/ath/if_ath_lna_div.h>
+#include <dev/netif/ath/ath/if_athdfs.h>
#ifdef ATH_TX99_DIAG
-#include <dev/ath/ath_tx99/ath_tx99.h>
+#include <dev/netif/ath/ath_tx99/ath_tx99.h>
#endif
#ifdef ATH_DEBUG_ALQ
-#include <dev/ath/if_ath_alq.h>
+#include <dev/netif/ath/ath/if_ath_alq.h>
#endif
/*
static void ath_node_recv_pspoll(struct ieee80211_node *, struct mbuf *);
#ifdef IEEE80211_SUPPORT_TDMA
-#include <dev/ath/if_ath_tdma.h>
+#include <dev/netif/ath/ath/if_ath_tdma.h>
#endif
SYSCTL_DECL(_hw_ath);
#include <sys/mutex.h>
#include <sys/errno.h>
-#include <machine/bus.h>
-#include <machine/resource.h>
#include <sys/bus.h>
#include <sys/rman.h>
#include <net/if_arp.h>
#include <net/ethernet.h>
-#include <net80211/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_var.h>
-#include <dev/ath/if_athvar.h>
+#include <dev/netif/ath/ath/if_athvar.h>
#include <mips/atheros/ar71xxreg.h>
#include <mips/atheros/ar91xxreg.h>
#include <mips/atheros/ar71xx_cpudef.h>
+#include <machine/resource.h>
+
/*
* bus glue.
*/
#include <sys/endian.h>
#include <sys/time.h>
-#include <dev/ath/if_ath_alq.h>
+#include <dev/netif/ath/ath/if_ath_alq.h>
#ifdef ATH_DEBUG_ALQ
static struct ale *
#include <sys/priv.h>
#include <sys/module.h>
#include <sys/ktr.h>
-#include <sys/smp.h> /* for mp_ncpus */
-
-#include <machine/bus.h>
#include <net/if.h>
#include <net/if_var.h>
#include <net/ethernet.h>
#include <net/if_llc.h>
-#include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_regdomain.h>
+#include <netproto/802_11/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_regdomain.h>
#ifdef IEEE80211_SUPPORT_SUPERG
-#include <net80211/ieee80211_superg.h>
+#include <netproto/802_11/ieee80211_superg.h>
#endif
#include <net/bpf.h>
#include <netinet/if_ether.h>
#endif
-#include <dev/ath/if_athvar.h>
+#include <dev/netif/ath/ath/if_athvar.h>
-#include <dev/ath/if_ath_debug.h>
-#include <dev/ath/if_ath_misc.h>
-#include <dev/ath/if_ath_tx.h>
-#include <dev/ath/if_ath_beacon.h>
+#include <dev/netif/ath/ath/if_ath_debug.h>
+#include <dev/netif/ath/ath/if_ath_misc.h>
+#include <dev/netif/ath/ath/if_ath_tx.h>
+#include <dev/netif/ath/ath/if_ath_beacon.h>
#ifdef ATH_TX99_DIAG
-#include <dev/ath/ath_tx99/ath_tx99.h>
+#include <dev/netif/ath/ath_tx99/ath_tx99.h>
#endif
/*
#include <sys/malloc.h>
#include <sys/mutex.h>
#include <sys/errno.h>
-
-#include <machine/bus.h>
-#include <machine/resource.h>
#include <sys/bus.h>
-
#include <sys/socket.h>
#include <net/if.h>
#include <net/if_arp.h>
#include <net/ethernet.h> /* XXX for ether_sprintf */
-#include <net80211/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_var.h>
#include <net/bpf.h>
#include <netinet/if_ether.h>
#endif
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/if_ath_btcoex.h>
+#include <machine/resource.h>
+
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath/if_ath_btcoex.h>
/*
* Initial AR9285 / (WB195) bluetooth coexistence settings,
#include <sys/taskqueue.h>
#include <sys/priv.h>
-#include <machine/bus.h>
-
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_media.h>
#include <net/ethernet.h>
#include <net/if_llc.h>
-#include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_regdomain.h>
+#include <netproto/802_11/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_regdomain.h>
#ifdef IEEE80211_SUPPORT_SUPERG
-#include <net80211/ieee80211_superg.h>
+#include <netproto/802_11/ieee80211_superg.h>
#endif
#ifdef IEEE80211_SUPPORT_TDMA
-#include <net80211/ieee80211_tdma.h>
+#include <netproto/802_11/ieee80211_tdma.h>
#endif
#include <net/bpf.h>
#include <netinet/if_ether.h>
#endif
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/ath_hal/ah_devid.h> /* XXX for softled */
-#include <dev/ath/ath_hal/ah_diagcodes.h>
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath_hal/ah_devid.h> /* XXX for softled */
+#include <dev/netif/ath/ath_hal/ah_diagcodes.h>
#ifdef ATH_TX99_DIAG
-#include <dev/ath/ath_tx99/ath_tx99.h>
+#include <dev/netif/ath/ath_tx99/ath_tx99.h>
#endif
#ifdef ATH_DEBUG
-#include <dev/ath/if_ath_debug.h>
+#include <dev/netif/ath/ath/if_ath_debug.h>
uint64_t ath_debug = 0;
#include <sys/taskqueue.h>
#include <sys/priv.h>
-#include <machine/bus.h>
-
#include <net/if.h>
#include <net/if_var.h>
#include <net/if_dl.h>
#include <net/ethernet.h>
#include <net/if_llc.h>
-#include <net80211/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_var.h>
#include <net/bpf.h>
-#include <dev/ath/if_athvar.h>
+#include <dev/netif/ath/ath/if_athvar.h>
-#include <dev/ath/if_ath_debug.h>
-#include <dev/ath/if_ath_keycache.h>
+#include <dev/netif/ath/ath/if_ath_debug.h>
+#include <dev/netif/ath/ath/if_ath_keycache.h>
#ifdef ATH_DEBUG
static void
#include <sys/priv.h>
#include <sys/module.h>
#include <sys/ktr.h>
-#include <sys/smp.h> /* for mp_ncpus */
-
-#include <machine/bus.h>
#include <net/if.h>
#include <net/if_dl.h>
#include <net/ethernet.h>
#include <net/if_llc.h>
-#include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_regdomain.h>
+#include <netproto/802_11/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_regdomain.h>
#ifdef IEEE80211_SUPPORT_SUPERG
-#include <net80211/ieee80211_superg.h>
+#include <netproto/802_11/ieee80211_superg.h>
#endif
#ifdef IEEE80211_SUPPORT_TDMA
-#include <net80211/ieee80211_tdma.h>
+#include <netproto/802_11/ieee80211_tdma.h>
#endif
#include <net/bpf.h>
#include <netinet/if_ether.h>
#endif
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/ath_hal/ah_devid.h> /* XXX for softled */
-#include <dev/ath/ath_hal/ah_diagcodes.h>
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath_hal/ah_devid.h> /* XXX for softled */
+#include <dev/netif/ath/ath_hal/ah_diagcodes.h>
-#include <dev/ath/if_ath_debug.h>
-#include <dev/ath/if_ath_misc.h>
+#include <dev/netif/ath/ath/if_ath_debug.h>
+#include <dev/netif/ath/ath/if_ath_misc.h>
-#include <dev/ath/if_ath_led.h>
+#include <dev/netif/ath/ath/if_ath_led.h>
/*
* Software LED driver routines.
#include <sys/malloc.h>
#include <sys/mutex.h>
#include <sys/errno.h>
-
-#include <machine/bus.h>
-#include <machine/resource.h>
#include <sys/bus.h>
-
#include <sys/socket.h>
#include <net/if.h>
#include <net/if_arp.h>
#include <net/ethernet.h> /* XXX for ether_sprintf */
-#include <net80211/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_var.h>
#include <net/bpf.h>
#include <netinet/if_ether.h>
#endif
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/if_ath_debug.h>
-#include <dev/ath/if_ath_lna_div.h>
+#include <machine/resource.h>
+
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath/if_ath_debug.h>
+#include <dev/netif/ath/ath/if_ath_lna_div.h>
/* Linux compability macros */
/*
#include <sys/mutex.h>
#include <sys/errno.h>
-#include <machine/bus.h>
-#include <machine/resource.h>
#include <sys/bus.h>
#include <sys/rman.h>
#include <net/if_arp.h>
#include <net/ethernet.h>
-#include <net80211/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_var.h>
+
+#include <machine/resource.h>
-#include <dev/ath/if_athvar.h>
+#include <dev/netif/ath/ath/if_athvar.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <sys/priv.h>
#include <sys/module.h>
#include <sys/ktr.h>
-#include <sys/smp.h> /* for mp_ncpus */
-
-#include <machine/bus.h>
#include <net/if.h>
#include <net/if_var.h>
#include <net/ethernet.h>
#include <net/if_llc.h>
-#include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_regdomain.h>
+#include <netproto/802_11/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_regdomain.h>
#ifdef IEEE80211_SUPPORT_SUPERG
-#include <net80211/ieee80211_superg.h>
+#include <netproto/802_11/ieee80211_superg.h>
#endif
#ifdef IEEE80211_SUPPORT_TDMA
-#include <net80211/ieee80211_tdma.h>
+#include <netproto/802_11/ieee80211_tdma.h>
#endif
#include <net/bpf.h>
#include <netinet/if_ether.h>
#endif
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/ath_hal/ah_devid.h> /* XXX for softled */
-#include <dev/ath/ath_hal/ah_diagcodes.h>
-
-#include <dev/ath/if_ath_debug.h>
-#include <dev/ath/if_ath_misc.h>
-#include <dev/ath/if_ath_tsf.h>
-#include <dev/ath/if_ath_tx.h>
-#include <dev/ath/if_ath_sysctl.h>
-#include <dev/ath/if_ath_led.h>
-#include <dev/ath/if_ath_keycache.h>
-#include <dev/ath/if_ath_rx.h>
-#include <dev/ath/if_ath_beacon.h>
-#include <dev/ath/if_athdfs.h>
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath_hal/ah_devid.h> /* XXX for softled */
+#include <dev/netif/ath/ath_hal/ah_diagcodes.h>
+
+#include <dev/netif/ath/ath/if_ath_debug.h>
+#include <dev/netif/ath/ath/if_ath_misc.h>
+#include <dev/netif/ath/ath/if_ath_tsf.h>
+#include <dev/netif/ath/ath/if_ath_tx.h>
+#include <dev/netif/ath/ath/if_ath_sysctl.h>
+#include <dev/netif/ath/ath/if_ath_led.h>
+#include <dev/netif/ath/ath/if_ath_keycache.h>
+#include <dev/netif/ath/ath/if_ath_rx.h>
+#include <dev/netif/ath/ath/if_ath_beacon.h>
+#include <dev/netif/ath/ath/if_athdfs.h>
#ifdef ATH_TX99_DIAG
-#include <dev/ath/ath_tx99/ath_tx99.h>
+#include <dev/netif/ath/ath_tx99/ath_tx99.h>
#endif
#ifdef ATH_DEBUG_ALQ
-#include <dev/ath/if_ath_alq.h>
+#include <dev/netif/ath/ath/if_ath_alq.h>
#endif
-#include <dev/ath/if_ath_lna_div.h>
+#include <dev/netif/ath/ath/if_ath_lna_div.h>
/*
* Calculate the receive filter according to the
#include <sys/priv.h>
#include <sys/module.h>
#include <sys/ktr.h>
-#include <sys/smp.h> /* for mp_ncpus */
-
-#include <machine/bus.h>
#include <net/if.h>
#include <net/if_var.h>
#include <net/ethernet.h>
#include <net/if_llc.h>
-#include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_regdomain.h>
+#include <netproto/802_11/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_regdomain.h>
#ifdef IEEE80211_SUPPORT_SUPERG
-#include <net80211/ieee80211_superg.h>
+#include <netproto/802_11/ieee80211_superg.h>
#endif
#ifdef IEEE80211_SUPPORT_TDMA
-#include <net80211/ieee80211_tdma.h>
+#include <netproto/802_11/ieee80211_tdma.h>
#endif
#include <net/bpf.h>
#include <netinet/if_ether.h>
#endif
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/ath_hal/ah_devid.h> /* XXX for softled */
-#include <dev/ath/ath_hal/ah_diagcodes.h>
-
-#include <dev/ath/if_ath_debug.h>
-#include <dev/ath/if_ath_misc.h>
-#include <dev/ath/if_ath_tsf.h>
-#include <dev/ath/if_ath_tx.h>
-#include <dev/ath/if_ath_sysctl.h>
-#include <dev/ath/if_ath_led.h>
-#include <dev/ath/if_ath_keycache.h>
-#include <dev/ath/if_ath_rx.h>
-#include <dev/ath/if_ath_beacon.h>
-#include <dev/ath/if_athdfs.h>
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath_hal/ah_devid.h> /* XXX for softled */
+#include <dev/netif/ath/ath_hal/ah_diagcodes.h>
+
+#include <dev/netif/ath/ath/if_ath_debug.h>
+#include <dev/netif/ath/ath/if_ath_misc.h>
+#include <dev/netif/ath/ath/if_ath_tsf.h>
+#include <dev/netif/ath/ath/if_ath_tx.h>
+#include <dev/netif/ath/ath/if_ath_sysctl.h>
+#include <dev/netif/ath/ath/if_ath_led.h>
+#include <dev/netif/ath/ath/if_ath_keycache.h>
+#include <dev/netif/ath/ath/if_ath_rx.h>
+#include <dev/netif/ath/ath/if_ath_beacon.h>
+#include <dev/netif/ath/ath/if_athdfs.h>
#ifdef ATH_TX99_DIAG
-#include <dev/ath/ath_tx99/ath_tx99.h>
+#include <dev/netif/ath/ath_tx99/ath_tx99.h>
#endif
-#include <dev/ath/if_ath_rx_edma.h>
+#include <dev/netif/ath/ath/if_ath_rx_edma.h>
#ifdef ATH_DEBUG_ALQ
-#include <dev/ath/if_ath_alq.h>
+#include <dev/netif/ath/ath/if_ath_alq.h>
#endif
/*
#include <sys/malloc.h>
#include <sys/mutex.h>
#include <sys/errno.h>
-
-#include <machine/bus.h>
-#include <machine/resource.h>
#include <sys/bus.h>
-
#include <sys/socket.h>
#include <net/if.h>
#include <net/if_arp.h>
#include <net/ethernet.h> /* XXX for ether_sprintf */
-#include <net80211/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_var.h>
#include <net/bpf.h>
#include <netinet/if_ether.h>
#endif
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/if_ath_spectral.h>
+#include <machine/resource.h>
+
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath/if_ath_spectral.h>
-#include <dev/ath/ath_hal/ah_desc.h>
+#include <dev/netif/ath/ath_hal/ah_desc.h>
struct ath_spectral_state {
HAL_SPECTRAL_PARAM spectral_state;
#include <sys/taskqueue.h>
#include <sys/priv.h>
-#include <machine/bus.h>
-
#include <net/if.h>
#include <net/if_var.h>
#include <net/if_dl.h>
#include <net/ethernet.h>
#include <net/if_llc.h>
-#include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_regdomain.h>
+#include <netproto/802_11/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_regdomain.h>
#ifdef IEEE80211_SUPPORT_SUPERG
-#include <net80211/ieee80211_superg.h>
+#include <netproto/802_11/ieee80211_superg.h>
#endif
#ifdef IEEE80211_SUPPORT_TDMA
-#include <net80211/ieee80211_tdma.h>
+#include <netproto/802_11/ieee80211_tdma.h>
#endif
#include <net/bpf.h>
#include <netinet/if_ether.h>
#endif
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/ath_hal/ah_devid.h> /* XXX for softled */
-#include <dev/ath/ath_hal/ah_diagcodes.h>
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath_hal/ah_devid.h> /* XXX for softled */
+#include <dev/netif/ath/ath_hal/ah_diagcodes.h>
-#include <dev/ath/if_ath_debug.h>
-#include <dev/ath/if_ath_led.h>
-#include <dev/ath/if_ath_misc.h>
-#include <dev/ath/if_ath_tx.h>
-#include <dev/ath/if_ath_sysctl.h>
+#include <dev/netif/ath/ath/if_ath_debug.h>
+#include <dev/netif/ath/ath/if_ath_led.h>
+#include <dev/netif/ath/ath/if_ath_misc.h>
+#include <dev/netif/ath/ath/if_ath_tx.h>
+#include <dev/netif/ath/ath/if_ath_sysctl.h>
#ifdef ATH_TX99_DIAG
-#include <dev/ath/ath_tx99/ath_tx99.h>
+#include <dev/netif/ath/ath_tx99/ath_tx99.h>
#endif
#ifdef ATH_DEBUG_ALQ
-#include <dev/ath/if_ath_alq.h>
+#include <dev/netif/ath/ath/if_ath_alq.h>
#endif
static int
#include <sys/priv.h>
#include <sys/module.h>
#include <sys/ktr.h>
-#include <sys/smp.h> /* for mp_ncpus */
-
-#include <machine/bus.h>
#include <net/if.h>
#include <net/if_var.h>
#include <net/ethernet.h>
#include <net/if_llc.h>
-#include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_regdomain.h>
+#include <netproto/802_11/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_regdomain.h>
#ifdef IEEE80211_SUPPORT_SUPERG
-#include <net80211/ieee80211_superg.h>
+#include <netproto/802_11/ieee80211_superg.h>
#endif
#ifdef IEEE80211_SUPPORT_TDMA
-#include <net80211/ieee80211_tdma.h>
+#include <netproto/802_11/ieee80211_tdma.h>
#endif
#include <net/bpf.h>
#include <netinet/if_ether.h>
#endif
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/ath_hal/ah_devid.h> /* XXX for softled */
-#include <dev/ath/ath_hal/ah_diagcodes.h>
-
-#include <dev/ath/if_ath_debug.h>
-#include <dev/ath/if_ath_misc.h>
-#include <dev/ath/if_ath_tsf.h>
-#include <dev/ath/if_ath_tx.h>
-#include <dev/ath/if_ath_sysctl.h>
-#include <dev/ath/if_ath_led.h>
-#include <dev/ath/if_ath_keycache.h>
-#include <dev/ath/if_ath_rx.h>
-#include <dev/ath/if_ath_beacon.h>
-#include <dev/ath/if_athdfs.h>
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath_hal/ah_devid.h> /* XXX for softled */
+#include <dev/netif/ath/ath_hal/ah_diagcodes.h>
+
+#include <dev/netif/ath/ath/if_ath_debug.h>
+#include <dev/netif/ath/ath/if_ath_misc.h>
+#include <dev/netif/ath/ath/if_ath_tsf.h>
+#include <dev/netif/ath/ath/if_ath_tx.h>
+#include <dev/netif/ath/ath/if_ath_sysctl.h>
+#include <dev/netif/ath/ath/if_ath_led.h>
+#include <dev/netif/ath/ath/if_ath_keycache.h>
+#include <dev/netif/ath/ath/if_ath_rx.h>
+#include <dev/netif/ath/ath/if_ath_beacon.h>
+#include <dev/netif/ath/ath/if_athdfs.h>
#ifdef ATH_TX99_DIAG
-#include <dev/ath/ath_tx99/ath_tx99.h>
+#include <dev/netif/ath/ath_tx99/ath_tx99.h>
#endif
#ifdef ATH_DEBUG_ALQ
-#include <dev/ath/if_ath_alq.h>
+#include <dev/netif/ath/ath/if_ath_alq.h>
#endif
#ifdef IEEE80211_SUPPORT_TDMA
-#include <dev/ath/if_ath_tdma.h>
+#include <dev/netif/ath/ath/if_ath_tdma.h>
static void ath_tdma_settimers(struct ath_softc *sc, u_int32_t nexttbtt,
u_int32_t bintval);
#include <sys/priv.h>
#include <sys/ktr.h>
-#include <machine/bus.h>
-
#include <net/if.h>
#include <net/if_var.h>
#include <net/if_dl.h>
#include <net/ethernet.h>
#include <net/if_llc.h>
-#include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_regdomain.h>
+#include <netproto/802_11/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_regdomain.h>
#ifdef IEEE80211_SUPPORT_SUPERG
-#include <net80211/ieee80211_superg.h>
+#include <netproto/802_11/ieee80211_superg.h>
#endif
#ifdef IEEE80211_SUPPORT_TDMA
-#include <net80211/ieee80211_tdma.h>
+#include <netproto/802_11/ieee80211_tdma.h>
#endif
-#include <net80211/ieee80211_ht.h>
+#include <netproto/802_11/ieee80211_ht.h>
#include <net/bpf.h>
#include <netinet/if_ether.h>
#endif
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/ath_hal/ah_devid.h> /* XXX for softled */
-#include <dev/ath/ath_hal/ah_diagcodes.h>
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath_hal/ah_devid.h> /* XXX for softled */
+#include <dev/netif/ath/ath_hal/ah_diagcodes.h>
-#include <dev/ath/if_ath_debug.h>
+#include <dev/netif/ath/ath/if_ath_debug.h>
#ifdef ATH_TX99_DIAG
-#include <dev/ath/ath_tx99/ath_tx99.h>
+#include <dev/netif/ath/ath_tx99/ath_tx99.h>
#endif
-#include <dev/ath/if_ath_misc.h>
-#include <dev/ath/if_ath_tx.h>
-#include <dev/ath/if_ath_tx_ht.h>
+#include <dev/netif/ath/ath/if_ath_misc.h>
+#include <dev/netif/ath/ath/if_ath_tx.h>
+#include <dev/netif/ath/ath/if_ath_tx_ht.h>
#ifdef ATH_DEBUG_ALQ
-#include <dev/ath/if_ath_alq.h>
+#include <dev/netif/ath/ath/if_ath_alq.h>
#endif
/*
#include <sys/priv.h>
#include <sys/module.h>
#include <sys/ktr.h>
-#include <sys/smp.h> /* for mp_ncpus */
-
-#include <machine/bus.h>
#include <net/if.h>
#include <net/if_var.h>
#include <net/ethernet.h>
#include <net/if_llc.h>
-#include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_regdomain.h>
+#include <netproto/802_11/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_regdomain.h>
#ifdef IEEE80211_SUPPORT_SUPERG
-#include <net80211/ieee80211_superg.h>
+#include <netproto/802_11/ieee80211_superg.h>
#endif
#ifdef IEEE80211_SUPPORT_TDMA
-#include <net80211/ieee80211_tdma.h>
+#include <netproto/802_11/ieee80211_tdma.h>
#endif
#include <net/bpf.h>
#include <netinet/if_ether.h>
#endif
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/ath_hal/ah_devid.h> /* XXX for softled */
-#include <dev/ath/ath_hal/ah_diagcodes.h>
-
-#include <dev/ath/if_ath_debug.h>
-#include <dev/ath/if_ath_misc.h>
-#include <dev/ath/if_ath_tsf.h>
-#include <dev/ath/if_ath_tx.h>
-#include <dev/ath/if_ath_sysctl.h>
-#include <dev/ath/if_ath_led.h>
-#include <dev/ath/if_ath_keycache.h>
-#include <dev/ath/if_ath_rx.h>
-#include <dev/ath/if_ath_beacon.h>
-#include <dev/ath/if_athdfs.h>
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath_hal/ah_devid.h> /* XXX for softled */
+#include <dev/netif/ath/ath_hal/ah_diagcodes.h>
+
+#include <dev/netif/ath/ath/if_ath_debug.h>
+#include <dev/netif/ath/ath/if_ath_misc.h>
+#include <dev/netif/ath/ath/if_ath_tsf.h>
+#include <dev/netif/ath/ath/if_ath_tx.h>
+#include <dev/netif/ath/ath/if_ath_sysctl.h>
+#include <dev/netif/ath/ath/if_ath_led.h>
+#include <dev/netif/ath/ath/if_ath_keycache.h>
+#include <dev/netif/ath/ath/if_ath_rx.h>
+#include <dev/netif/ath/ath/if_ath_beacon.h>
+#include <dev/netif/ath/ath/if_athdfs.h>
#ifdef ATH_TX99_DIAG
-#include <dev/ath/ath_tx99/ath_tx99.h>
+#include <dev/netif/ath/ath_tx99/ath_tx99.h>
#endif
-#include <dev/ath/if_ath_tx_edma.h>
+#include <dev/netif/ath/ath/if_ath_tx_edma.h>
#ifdef ATH_DEBUG_ALQ
-#include <dev/ath/if_ath_alq.h>
+#include <dev/netif/ath/ath/if_ath_alq.h>
#endif
/*
#include <sys/taskqueue.h>
#include <sys/priv.h>
-#include <machine/bus.h>
-
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_media.h>
#include <net/ethernet.h>
#include <net/if_llc.h>
-#include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_regdomain.h>
+#include <netproto/802_11/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_regdomain.h>
#ifdef IEEE80211_SUPPORT_SUPERG
-#include <net80211/ieee80211_superg.h>
+#include <netproto/802_11/ieee80211_superg.h>
#endif
#ifdef IEEE80211_SUPPORT_TDMA
-#include <net80211/ieee80211_tdma.h>
+#include <netproto/802_11/ieee80211_tdma.h>
#endif
#include <net/bpf.h>
#include <netinet/if_ether.h>
#endif
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/ath_hal/ah_devid.h> /* XXX for softled */
-#include <dev/ath/ath_hal/ah_diagcodes.h>
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath_hal/ah_devid.h> /* XXX for softled */
+#include <dev/netif/ath/ath_hal/ah_diagcodes.h>
#ifdef ATH_TX99_DIAG
-#include <dev/ath/ath_tx99/ath_tx99.h>
+#include <dev/netif/ath/ath_tx99/ath_tx99.h>
#endif
-#include <dev/ath/if_ath_tx.h> /* XXX for some support functions */
-#include <dev/ath/if_ath_tx_ht.h>
-#include <dev/ath/if_athrate.h>
-#include <dev/ath/if_ath_debug.h>
+#include <dev/netif/ath/ath/if_ath_tx.h> /* XXX for some support functions */
+#include <dev/netif/ath/ath/if_ath_tx_ht.h>
+#include <dev/netif/ath/ath/if_athrate.h>
+#include <dev/netif/ath/ath/if_ath_debug.h>
/*
* XXX net80211?
#include <machine/atomic.h>
-#include <dev/ath/ath_hal/ah.h>
-#include <dev/ath/ath_hal/ah_desc.h>
-#include <net80211/ieee80211_radiotap.h>
-#include <dev/ath/if_athioctl.h>
-#include <dev/ath/if_athrate.h>
+#include <dev/netif/ath/ath_hal/ah.h>
+#include <dev/netif/ath/ath_hal/ah_desc.h>
+#include <netproto/802_11/ieee80211_radiotap.h>
+#include <dev/netif/ath/ath/if_athioctl.h>
+#include <dev/netif/ath/ath/if_athrate.h>
#ifdef ATH_DEBUG_ALQ
-#include <dev/ath/if_ath_alq.h>
+#include <dev/netif/ath/ath/if_ath_alq.h>
#endif
#define ATH_TIMEOUT 1000
#include <sys/malloc.h>
#include <sys/mutex.h>
#include <sys/errno.h>
-
-#include <machine/bus.h>
-#include <machine/resource.h>
#include <sys/bus.h>
-
#include <sys/socket.h>
#include <net/if.h>
#include <net/if_arp.h>
#include <net/ethernet.h> /* XXX for ether_sprintf */
-#include <net80211/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_var.h>
#include <net/bpf.h>
#include <netinet/if_ether.h>
#endif
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/if_athdfs.h>
+#include <machine/resource.h>
+
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath/if_athdfs.h>
-#include <dev/ath/ath_hal/ah_desc.h>
+#include <dev/netif/ath/ath_hal/ah_desc.h>
/*
* Methods which are required
#define AH_MIN(a,b) ((a)<(b)?(a):(b))
#define AH_MAX(a,b) ((a)>(b)?(a):(b))
-#include <net80211/_ieee80211.h>
+#include <netproto/802_11/_ieee80211.h>
#include "opt_ah.h" /* needed for AH_SUPPORT_AR5416 */
#ifndef AH_SUPPORT_AR5416
#include <net/ethernet.h> /* XXX for ether_sprintf */
-#include <dev/ath/ath_hal/ah.h>
-#include <dev/ath/ath_hal/ah_debug.h>
+#include <dev/netif/ath/ath_hal/ah.h>
+#include <dev/netif/ath/ath_hal/ah_debug.h>
/*
* WiSoC boards overload the bus tag with information about the
*/
#include <sys/alq.h>
#include <sys/pcpu.h>
-#include <dev/ath/ath_hal/ah_decode.h>
+#include <dev/netif/ath/ath_hal/ah_decode.h>
static struct alq *ath_hal_alq;
static int ath_hal_alq_emitdev; /* need to emit DEVICE record */
#include <sys/endian.h>
#include <sys/linker_set.h>
-#include <machine/bus.h>
-
/*
* Bus i/o type definitions.
*/
#include "ah.h"
-#include <net80211/_ieee80211.h>
-#include <net80211/ieee80211_regdomain.h>
+#include <netproto/802_11/_ieee80211.h>
+#include <netproto/802_11/ieee80211_regdomain.h>
#include "ah_internal.h"
#include "ah_eeprom.h"
#ifndef _DEV_ATH_AR5416REG_H
#define _DEV_ATH_AR5416REG_H
-#include <dev/ath/ath_hal/ar5212/ar5212reg.h>
+#include <dev/netif/ath/ath_hal/ar5212/ar5212reg.h>
/*
* Register added starting with the AR5416
#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/errno.h>
-
-#include <machine/bus.h>
-#include <machine/resource.h>
#include <sys/bus.h>
-
#include <sys/socket.h>
#include <net/if.h>
#include <net/if_media.h>
#include <net/if_arp.h>
-#include <net80211/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_var.h>
#include <net/bpf.h>
#include <netinet/if_ether.h>
#endif
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/ath_rate/amrr/amrr.h>
-#include <dev/ath/ath_hal/ah_desc.h>
+#include <machine/resource.h>
+
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath_rate/amrr/amrr.h>
+#include <dev/netif/ath/ath_hal/ah_desc.h>
static int ath_rateinterval = 1000; /* rate ctl interval (ms) */
static int ath_rate_max_success_threshold = 10;
#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/errno.h>
-
-#include <machine/bus.h>
-#include <machine/resource.h>
#include <sys/bus.h>
-
#include <sys/socket.h>
#include <net/if.h>
#include <net/if_arp.h>
#include <net/ethernet.h> /* XXX for ether_sprintf */
-#include <net80211/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_var.h>
#include <net/bpf.h>
#include <netinet/if_ether.h>
#endif
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/ath_rate/onoe/onoe.h>
-#include <dev/ath/ath_hal/ah_desc.h>
+#include <machine/resource.h>
+
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath_rate/onoe/onoe.h>
+#include <dev/netif/ath/ath_hal/ah_desc.h>
/*
* Default parameters for the rate control algorithm. These are
#include <sys/malloc.h>
#include <sys/mutex.h>
#include <sys/errno.h>
-
-#include <machine/bus.h>
-#include <machine/resource.h>
#include <sys/bus.h>
-
#include <sys/socket.h>
#include <net/if.h>
#include <net/if_arp.h>
#include <net/ethernet.h> /* XXX for ether_sprintf */
-#include <net80211/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_var.h>
#include <net/bpf.h>
#include <netinet/if_ether.h>
#endif
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/ath_rate/sample/sample.h>
-#include <dev/ath/ath_hal/ah_desc.h>
-#include <dev/ath/ath_rate/sample/tx_schedules.h>
+#include <machine/resource.h>
+
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath_rate/sample/sample.h>
+#include <dev/netif/ath/ath_hal/ah_desc.h>
+#include <dev/netif/ath/ath_rate/sample/tx_schedules.h>
/*
* This file is an implementation of the SampleRate algorithm