svn commit: r226782 - user/adrian/if_ath_tx/sys/dev/ath
Adrian Chadd
adrian at FreeBSD.org
Wed Oct 26 03:48:50 UTC 2011
Author: adrian
Date: Wed Oct 26 03:48:49 2011
New Revision: 226782
URL: http://svn.freebsd.org/changeset/base/226782
Log:
Redo the commits that were undone when I rolled back some stuff.
* remove crypto readme
* disable the sc_in_* stuff for now
* fix padding
Deleted:
user/adrian/if_ath_tx/sys/dev/ath/README-crypto
Modified:
user/adrian/if_ath_tx/sys/dev/ath/if_ath.c
user/adrian/if_ath_tx/sys/dev/ath/if_athioctl.h
user/adrian/if_ath_tx/sys/dev/ath/if_athvar.h
Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath.c
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/if_ath.c Wed Oct 26 03:47:39 2011 (r226781)
+++ user/adrian/if_ath_tx/sys/dev/ath/if_ath.c Wed Oct 26 03:48:49 2011 (r226782)
@@ -1829,10 +1829,6 @@ ath_reset(struct ifnet *ifp, ATH_RESET_T
DPRINTF(sc, ATH_DEBUG_RESET, "%s: called\n", __func__);
- ATH_LOCK(sc);
- sc->sc_in_reset++;
- ATH_UNLOCK(sc);
-
ath_hal_intrset(ah, 0); /* disable interrupts */
ath_draintxq(sc, reset_type); /* stop xmit side */
/*
@@ -1869,10 +1865,6 @@ ath_reset(struct ifnet *ifp, ATH_RESET_T
}
ath_hal_intrset(ah, sc->sc_imask);
- ATH_LOCK(sc);
- sc->sc_in_reset--;
- ATH_UNLOCK(sc);
-
ath_start(ifp); /* restart xmit */
return 0;
}
@@ -5247,11 +5239,6 @@ ath_set_channel(struct ieee80211com *ic)
struct ifnet *ifp = ic->ic_ifp;
struct ath_softc *sc = ifp->if_softc;
- /* This isn't strictly a reset, but we still have to drain */
- ATH_LOCK(sc);
- sc->sc_in_reset++;
- ATH_UNLOCK(sc);
-
(void) ath_chan_set(sc, ic->ic_curchan);
/*
* If we are returning to our bss channel then mark state
@@ -5261,10 +5248,6 @@ ath_set_channel(struct ieee80211com *ic)
*/
if (!sc->sc_scanning && ic->ic_curchan == ic->ic_bsschan)
sc->sc_syncbeacon = 1;
-
- ATH_LOCK(sc);
- sc->sc_in_reset--;
- ATH_UNLOCK(sc);
}
/*
Modified: user/adrian/if_ath_tx/sys/dev/ath/if_athioctl.h
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/if_athioctl.h Wed Oct 26 03:47:39 2011 (r226781)
+++ user/adrian/if_ath_tx/sys/dev/ath/if_athioctl.h Wed Oct 26 03:48:49 2011 (r226782)
@@ -153,7 +153,7 @@ struct ath_stats {
u_int32_t ast_tx_getbusybuf;
u_int32_t ast_tx_intr;
u_int32_t ast_rx_intr;
- u_int32_t ast_pad[7];
+ u_int32_t ast_pad[4];
};
#define SIOCGATHSTATS _IOWR('i', 137, struct ifreq)
Modified: user/adrian/if_ath_tx/sys/dev/ath/if_athvar.h
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/if_athvar.h Wed Oct 26 03:47:39 2011 (r226781)
+++ user/adrian/if_ath_tx/sys/dev/ath/if_athvar.h Wed Oct 26 03:48:49 2011 (r226782)
@@ -434,11 +434,13 @@ struct ath_softc {
*/
uint32_t sc_txq_active; /* bitmap of active TXQs */
uint32_t sc_kickpcu; /* whether to kick the PCU */
+#if 0
uint32_t sc_in_reset; /* currently reset/chan change */
uint32_t sc_in_rxtasklet; /* currently in rx tasklet */
uint32_t sc_in_rxproc; /* currently in ath_rx_proc */
uint32_t sc_in_txsend; /* currently in ath_start / ath_raw_xmit */
uint32_t sc_in_txproc; /* currently in ath_tx_proc */
+#endif
u_int sc_keymax; /* size of key cache */
u_int8_t sc_keymap[ATH_KEYBYTES];/* key use bit map */
More information about the svn-src-user
mailing list