diff options
author | Sujith <Sujith.Manoharan@atheros.com> | 2008-08-11 04:35:46 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-08-29 16:24:01 -0400 |
commit | 98deeea0b3464955ec416c30cbd0c3d21cacfa9a (patch) | |
tree | 3cf039e52965164e6b3b4c74c4a06ac75f8ea808 /drivers/net/wireless/ath9k/recv.c | |
parent | 7c56d24bc80112daadc7ef54247a5fc8397dbc5c (diff) |
ath9k: Trim struct ath_softc
Add sc_rxflush and sc_noreset as bitfields to sc_flags.
Remove a few variables and function prototypes that are unused.
Signed-off-by: Sujith Manoharan <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath9k/recv.c')
-rw-r--r-- | drivers/net/wireless/ath9k/recv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath9k/recv.c b/drivers/net/wireless/ath9k/recv.c index 9c7583210e36..af2011fb05a0 100644 --- a/drivers/net/wireless/ath9k/recv.c +++ b/drivers/net/wireless/ath9k/recv.c | |||
@@ -504,7 +504,7 @@ int ath_rx_init(struct ath_softc *sc, int nbufs) | |||
504 | 504 | ||
505 | do { | 505 | do { |
506 | spin_lock_init(&sc->sc_rxflushlock); | 506 | spin_lock_init(&sc->sc_rxflushlock); |
507 | sc->sc_rxflush = 0; | 507 | sc->sc_flags &= ~SC_OP_RXFLUSH; |
508 | spin_lock_init(&sc->sc_rxbuflock); | 508 | spin_lock_init(&sc->sc_rxbuflock); |
509 | 509 | ||
510 | /* | 510 | /* |
@@ -707,11 +707,11 @@ void ath_flushrecv(struct ath_softc *sc) | |||
707 | * progress (see references to sc_rxflush) | 707 | * progress (see references to sc_rxflush) |
708 | */ | 708 | */ |
709 | spin_lock_bh(&sc->sc_rxflushlock); | 709 | spin_lock_bh(&sc->sc_rxflushlock); |
710 | sc->sc_rxflush = 1; | 710 | sc->sc_flags |= SC_OP_RXFLUSH; |
711 | 711 | ||
712 | ath_rx_tasklet(sc, 1); | 712 | ath_rx_tasklet(sc, 1); |
713 | 713 | ||
714 | sc->sc_rxflush = 0; | 714 | sc->sc_flags &= ~SC_OP_RXFLUSH; |
715 | spin_unlock_bh(&sc->sc_rxflushlock); | 715 | spin_unlock_bh(&sc->sc_rxflushlock); |
716 | } | 716 | } |
717 | 717 | ||
@@ -755,7 +755,7 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush) | |||
755 | 755 | ||
756 | do { | 756 | do { |
757 | /* If handling rx interrupt and flush is in progress => exit */ | 757 | /* If handling rx interrupt and flush is in progress => exit */ |
758 | if (sc->sc_rxflush && (flush == 0)) | 758 | if ((sc->sc_flags & SC_OP_RXFLUSH) && (flush == 0)) |
759 | break; | 759 | break; |
760 | 760 | ||
761 | spin_lock_bh(&sc->sc_rxbuflock); | 761 | spin_lock_bh(&sc->sc_rxbuflock); |