commit 8050a3fbf9d830995b80b32d72f6d4f405c9042f
Author: Jiri Slaby <ku@bellona.localdomain>
Date:   Sat Aug 4 23:00:27 2007 +0200

    remove UNUSED entries from softc

diff --git a/ath5k_base.c b/ath5k_base.c
index 79ed348..751388b 100644
--- a/ath5k_base.c
+++ b/ath5k_base.c
@@ -1679,7 +1679,6 @@ static irqreturn_t ath_intr(int irq, void *dev_id)
 			if (status & AR5K_INT_TX)
 				tasklet_schedule(&sc->txtq);
 			if (status & AR5K_INT_BMISS) {
-/*				tasklet_schedule(&sc->bmisstq);*/
 			}
 			if (status & AR5K_INT_MIB) {
 				/* TODO */
diff --git a/ath5k_base.h b/ath5k_base.h
index bc38bec..da20ef2 100644
--- a/ath5k_base.h
+++ b/ath5k_base.h
@@ -137,21 +137,13 @@ struct ath_softc {
 	dma_addr_t		desc_daddr;	/* DMA (physical) address */
 	size_t			desc_len;	/* size of TX/RX descriptors */
 	u16			cachelsz;	/* cache line size */
-#ifdef UNUSED
-	void			(*sc_setdefantenna)(struct ath_softc *, u_int);
-#endif
+
 	unsigned int		invalid : 1,	/* disable hardware accesses */
 				mrretry : 1,	/* multi-rate retry support */
 				promisc : 1;
-#ifdef UNUSED
-				sc_diversity : 1,/* enable rx diversity */
-				sc_hasveol : 1,	/* tx VEOL support */
-				sc_mcastkey: 1, /* mcast key cache search */
-				sc_hasclrkey:1; /* CLR key supported */
-						/* rate tables */
-#endif
-	unsigned int			curmode;  /* current phy mode */
-	struct ieee80211_channel	*curchan; /* current h/w channel */
+
+	unsigned int		curmode;	/* current phy mode */
+	struct ieee80211_channel *curchan;	/* current h/w channel */
 
 	int 			iface_id;	/* add/remove_interface id */
 
@@ -161,10 +153,7 @@ struct ath_softc {
 		u16	ledon;		/* softled on time */
 		u16	ledoff;		/* softled off time */
 	} hwmap[32];				/* h/w rate ix mappings */
-#ifdef UNUSED
-	u8			sc_protrix;	/* protection rate index */
-	u_int			sc_txantenna;	/* tx antenna (fixed or auto) */
-#endif
+
 	enum ath5k_int		imask;		/* interrupt mask copy */
 
 	DECLARE_BITMAP(keymap, AR5K_KEYCACHE_SIZE); /* key use bit map */
@@ -188,17 +177,12 @@ struct ath_softc {
 	spinlock_t		rxbuflock;
 	u32			*rxlink;	/* link ptr in last RX desc */
 	struct tasklet_struct	rxtq;		/* rx intr tasklet */
-#ifdef UNUSED
-	u8			sc_defant;	/* current default antenna */
-	u8			sc_rxotherant;	/* rx's on non-default antenna*/
-#endif
+
 	struct list_head	txbuf;		/* transmit buffer */
 	spinlock_t		txbuflock;
 	unsigned int		txbuf_len;	/* buf count in txbuf list */
 	struct ath_txq		txqs[2];	/* beacon and tx */
-#ifdef UNUSED
-	struct ath_txq		*sc_ac2q[5];	/* WME AC -> h/w q map */ 
-#endif
+
 	struct ath_txq		*txq;		/* beacon and tx*/
 	struct tasklet_struct	txtq;		/* tx intr tasklet */
 
@@ -207,16 +191,7 @@ struct ath_softc {
 				bmisscount,	/* missed beacon transmits */
 				bintval,	/* beacon interval */
 				bsent;
-#ifdef BEACON
-	u32			sc_ant_tx[8];	/* recent tx frames/antenna */
-	struct ath_txq		*cabq;		/* tx q for cab frames */
 
-	struct tasklet_struct	bmisstq;	/* bmiss intr tasklet */
-#endif
-#ifdef UNUSED
-	struct ctl_table_header	*sc_sysctl_header;
-	struct ctl_table	*sc_sysctls;
-#endif
 	struct timer_list	calib_tim;	/* calibration timer */
 };