commit d22f61acfd8493bf1dae2ff29b7bde7db285f0d0 Author: Jiri Slaby Date: Fri Aug 3 22:40:35 2007 +0200 remove ath_ioctl.h and move the stuff to the ath.h diff --git a/ath.h b/ath.h index c61119c..64d1ecf 100644 --- a/ath.h +++ b/ath.h @@ -48,7 +48,6 @@ #include #include "ath5k.h" -#include "ath_ioctl.h" #define ATH_TIMEOUT 1000 @@ -112,6 +111,72 @@ struct ath_txq { bool setup; }; +struct ath_stats { + __u32 ast_watchdog; /* device reset by watchdog */ + __u32 ast_hardware; /* fatal hardware error interrupts */ + __u32 ast_bmiss; /* beacon miss interrupts */ + __u32 ast_bstuck; /* beacon stuck interrupts */ + __u32 ast_rxorn; /* rx overrun interrupts */ + __u32 ast_rxeol; /* rx eol interrupts */ + __u32 ast_txurn; /* tx underrun interrupts */ + __u32 ast_mib; /* mib interrupts */ + __u32 ast_intrcoal; /* interrupts coalesced */ + __u32 ast_tx_packets; /* packet sent on the interface */ + __u32 ast_tx_mgmt; /* management frames transmitted */ + __u32 ast_tx_discard; /* frames discarded prior to assoc */ + __u32 ast_tx_invalid; /* frames discarded 'cuz device gone */ + __u32 ast_tx_qstop; /* output stopped 'cuz no buffer */ + __u32 ast_tx_encap; /* tx encapsulation failed */ + __u32 ast_tx_nonode; /* tx failed 'cuz no node */ + __u32 ast_tx_nobuf; /* tx failed 'cuz no tx buffer (data) */ + __u32 ast_tx_nobufmgt;/* tx failed 'cuz no tx buffer (mgmt)*/ + __u32 ast_tx_linear; /* tx linearized to cluster */ + __u32 ast_tx_nodata; /* tx discarded empty frame */ + __u32 ast_tx_busdma; /* tx failed for dma resrcs */ + __u32 ast_tx_xretries;/* tx failed 'cuz too many retries */ + __u32 ast_tx_fifoerr; /* tx failed 'cuz FIFO underrun */ + __u32 ast_tx_filtered;/* tx failed 'cuz xmit filtered */ + __u32 ast_tx_shortretry;/* tx on-chip retries (short) */ + __u32 ast_tx_longretry;/* tx on-chip retries (long) */ + __u32 ast_tx_badrate; /* tx failed 'cuz bogus xmit rate */ + __u32 ast_tx_noack; /* tx frames with no ack marked */ + __u32 ast_tx_rts; /* tx frames with rts enabled */ + __u32 ast_tx_cts; /* tx frames with cts enabled */ + __u32 ast_tx_shortpre;/* tx frames with short preamble */ + __u32 ast_tx_altrate; /* tx frames with alternate rate */ + __u32 ast_tx_protect; /* tx frames with protection */ + __u32 ast_tx_ctsburst;/* tx frames with cts and bursting */ + __u32 ast_tx_ctsext; /* tx frames with cts extension */ + __u32 ast_rx_nobuf; /* rx setup failed 'cuz no skb */ + __u32 ast_rx_busdma; /* rx setup failed for dma resrcs */ + __u32 ast_rx_orn; /* rx failed 'cuz of desc overrun */ + __u32 ast_rx_crcerr; /* rx failed 'cuz of bad CRC */ + __u32 ast_rx_fifoerr; /* rx failed 'cuz of FIFO overrun */ + __u32 ast_rx_badcrypt;/* rx failed 'cuz decryption */ + __u32 ast_rx_badmic; /* rx failed 'cuz MIC failure */ + __u32 ast_rx_phyerr; /* rx failed 'cuz of PHY err */ + __u32 ast_rx_phy[32]; /* rx PHY error per-code counts */ + __u32 ast_rx_tooshort;/* rx discarded 'cuz frame too short */ + __u32 ast_rx_toobig; /* rx discarded 'cuz frame too large */ + __u32 ast_rx_packets; /* packet recv on the interface */ + __u32 ast_rx_mgt; /* management frames received */ + __u32 ast_rx_ctl; /* rx discarded 'cuz ctl frame */ + __s8 ast_tx_rssi; /* tx rssi of last ack */ + __s8 ast_rx_rssi; /* rx rssi from histogram */ + __u32 ast_be_xmit; /* beacons transmitted */ + __u32 ast_be_nobuf; /* beacon setup failed 'cuz no skb */ + __u32 ast_per_cal; /* periodic calibration calls */ + __u32 ast_per_calfail;/* periodic calibration failed */ + __u32 ast_per_rfgain; /* periodic calibration rfgain reset */ + __u32 ast_rate_calls; /* rate control checks */ + __u32 ast_rate_raise; /* rate control raised xmit rate */ + __u32 ast_rate_drop; /* rate control dropped xmit rate */ + __u32 ast_ant_defswitch;/* rx/default antenna switches */ + __u32 ast_ant_txswitch;/* tx antenna switches */ + __u32 ast_ant_rx[8]; /* rx frames with antenna */ + __u32 ast_ant_tx[8]; /* tx frames with antenna */ +}; + #if CHAN_DEBUG #define ATH_CHAN_MAX (26+26+26+200+200) #else diff --git a/ath_ioctl.h b/ath_ioctl.h deleted file mode 100644 index 34e6f0d..0000000 --- a/ath_ioctl.h +++ /dev/null @@ -1,113 +0,0 @@ -/*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer, - * without modification. - * 2. Redistributions in binary form must reproduce at minimum a disclaimer - * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any - * redistribution must be conditioned upon including a substantially - * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * - * NO WARRANTY - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, - * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER - * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGES. - * - * $FreeBSD: src/sys/dev/ath/if_athioctl.h,v 1.9 2004/12/31 22:41:45 sam Exp $ - */ - -/* - * Ioctl-related defintions for the Atheros Wireless LAN controller driver. - */ -#ifndef _DEV_ATH_ATHIOCTL_H -#define _DEV_ATH_ATHIOCTL_H - -#include - -struct ath_stats { - __u32 ast_watchdog; /* device reset by watchdog */ - __u32 ast_hardware; /* fatal hardware error interrupts */ - __u32 ast_bmiss; /* beacon miss interrupts */ - __u32 ast_bstuck; /* beacon stuck interrupts */ - __u32 ast_rxorn; /* rx overrun interrupts */ - __u32 ast_rxeol; /* rx eol interrupts */ - __u32 ast_txurn; /* tx underrun interrupts */ - __u32 ast_mib; /* mib interrupts */ - __u32 ast_intrcoal; /* interrupts coalesced */ - __u32 ast_tx_packets; /* packet sent on the interface */ - __u32 ast_tx_mgmt; /* management frames transmitted */ - __u32 ast_tx_discard; /* frames discarded prior to assoc */ - __u32 ast_tx_invalid; /* frames discarded 'cuz device gone */ - __u32 ast_tx_qstop; /* output stopped 'cuz no buffer */ - __u32 ast_tx_encap; /* tx encapsulation failed */ - __u32 ast_tx_nonode; /* tx failed 'cuz no node */ - __u32 ast_tx_nobuf; /* tx failed 'cuz no tx buffer (data) */ - __u32 ast_tx_nobufmgt;/* tx failed 'cuz no tx buffer (mgmt)*/ - __u32 ast_tx_linear; /* tx linearized to cluster */ - __u32 ast_tx_nodata; /* tx discarded empty frame */ - __u32 ast_tx_busdma; /* tx failed for dma resrcs */ - __u32 ast_tx_xretries;/* tx failed 'cuz too many retries */ - __u32 ast_tx_fifoerr; /* tx failed 'cuz FIFO underrun */ - __u32 ast_tx_filtered;/* tx failed 'cuz xmit filtered */ - __u32 ast_tx_shortretry;/* tx on-chip retries (short) */ - __u32 ast_tx_longretry;/* tx on-chip retries (long) */ - __u32 ast_tx_badrate; /* tx failed 'cuz bogus xmit rate */ - __u32 ast_tx_noack; /* tx frames with no ack marked */ - __u32 ast_tx_rts; /* tx frames with rts enabled */ - __u32 ast_tx_cts; /* tx frames with cts enabled */ - __u32 ast_tx_shortpre;/* tx frames with short preamble */ - __u32 ast_tx_altrate; /* tx frames with alternate rate */ - __u32 ast_tx_protect; /* tx frames with protection */ - __u32 ast_tx_ctsburst;/* tx frames with cts and bursting */ - __u32 ast_tx_ctsext; /* tx frames with cts extension */ - __u32 ast_rx_nobuf; /* rx setup failed 'cuz no skb */ - __u32 ast_rx_busdma; /* rx setup failed for dma resrcs */ - __u32 ast_rx_orn; /* rx failed 'cuz of desc overrun */ - __u32 ast_rx_crcerr; /* rx failed 'cuz of bad CRC */ - __u32 ast_rx_fifoerr; /* rx failed 'cuz of FIFO overrun */ - __u32 ast_rx_badcrypt;/* rx failed 'cuz decryption */ - __u32 ast_rx_badmic; /* rx failed 'cuz MIC failure */ - __u32 ast_rx_phyerr; /* rx failed 'cuz of PHY err */ - __u32 ast_rx_phy[32]; /* rx PHY error per-code counts */ - __u32 ast_rx_tooshort;/* rx discarded 'cuz frame too short */ - __u32 ast_rx_toobig; /* rx discarded 'cuz frame too large */ - __u32 ast_rx_packets; /* packet recv on the interface */ - __u32 ast_rx_mgt; /* management frames received */ - __u32 ast_rx_ctl; /* rx discarded 'cuz ctl frame */ - __s8 ast_tx_rssi; /* tx rssi of last ack */ - __s8 ast_rx_rssi; /* rx rssi from histogram */ - __u32 ast_be_xmit; /* beacons transmitted */ - __u32 ast_be_nobuf; /* beacon setup failed 'cuz no skb */ - __u32 ast_per_cal; /* periodic calibration calls */ - __u32 ast_per_calfail;/* periodic calibration failed */ - __u32 ast_per_rfgain; /* periodic calibration rfgain reset */ - __u32 ast_rate_calls; /* rate control checks */ - __u32 ast_rate_raise; /* rate control raised xmit rate */ - __u32 ast_rate_drop; /* rate control dropped xmit rate */ - __u32 ast_ant_defswitch;/* rx/default antenna switches */ - __u32 ast_ant_txswitch;/* tx antenna switches */ - __u32 ast_ant_rx[8]; /* rx frames with antenna */ - __u32 ast_ant_tx[8]; /* tx frames with antenna */ -}; - -#endif