From 7797076e12038e698439aac7483fdd2415f68ceb Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 20 Jul 2008 05:50:30 -0700 Subject: [PATCH] Remove the descriptor swap Remove the descriptor swap, as the driver already configures the hardware for descriptor swapping on big endian systems. Signed-off-by: Felix Fietkau Signed-off-by: Luis R. Rodriguez --- drivers/net/wireless/ath9k/beacon.c | 5 ----- drivers/net/wireless/ath9k/core.c | 16 ---------------- drivers/net/wireless/ath9k/core.h | 1 - drivers/net/wireless/ath9k/xmit.c | 1 - 4 files changed, 0 insertions(+), 23 deletions(-) diff --git a/drivers/net/wireless/ath9k/beacon.c b/drivers/net/wireless/ath9k/beacon.c index ce99cfb..e94ddc8 100644 --- a/drivers/net/wireless/ath9k/beacon.c +++ b/drivers/net/wireless/ath9k/beacon.c @@ -140,11 +140,6 @@ static void ath_beacon_setup(struct ath_softc *sc, series[0].RateFlags = (ctsrate) ? HAL_RATESERIES_RTS_CTS : 0; ath9k_hw_set11n_ratescenario(ah, ds, ds, 0, ctsrate, ctsduration, series, 4, 0); - - /* NB: The desc swap function becomes void, - * if descriptor swapping is not enabled - */ - ath_desc_swap(ds); } /* Move everything from the vap's mcast queue to the hardware cab queue. diff --git a/drivers/net/wireless/ath9k/core.c b/drivers/net/wireless/ath9k/core.c index 13d5b17..2bdf12a 100644 --- a/drivers/net/wireless/ath9k/core.c +++ b/drivers/net/wireless/ath9k/core.c @@ -2141,22 +2141,6 @@ void ath_descdma_cleanup(struct ath_softc *sc, memzero(dd, sizeof(*dd)); } -/* - * Endian Swap for transmit descriptor - * - * XXX: Move cpu_to_le32() into hw.c and anywhere we set them, then - * remove this. -*/ -void ath_desc_swap(struct ath_desc *ds) -{ - ds->ds_link = cpu_to_le32(ds->ds_link); - ds->ds_data = cpu_to_le32(ds->ds_data); - ds->ds_ctl0 = cpu_to_le32(ds->ds_ctl0); - ds->ds_ctl1 = cpu_to_le32(ds->ds_ctl1); - ds->ds_hw[0] = cpu_to_le32(ds->ds_hw[0]); - ds->ds_hw[1] = cpu_to_le32(ds->ds_hw[1]); -} - /*************/ /* Utilities */ /*************/ diff --git a/drivers/net/wireless/ath9k/core.h b/drivers/net/wireless/ath9k/core.h index 1499f6e..520a6ef 100644 --- a/drivers/net/wireless/ath9k/core.h +++ b/drivers/net/wireless/ath9k/core.h @@ -384,7 +384,6 @@ void ath_desc_free(struct ath_softc *sc); void ath_descdma_cleanup(struct ath_softc *sc, struct ath_descdma *dd, struct list_head *head); -void ath_desc_swap(struct ath_desc *ds); /******/ /* RX */ diff --git a/drivers/net/wireless/ath9k/xmit.c b/drivers/net/wireless/ath9k/xmit.c index 96fc2b5..5caa85b 100644 --- a/drivers/net/wireless/ath9k/xmit.c +++ b/drivers/net/wireless/ath9k/xmit.c @@ -2062,7 +2062,6 @@ static int ath_tx_start_dma(struct ath_softc *sc, AH_TRUE, /* first segment */ (n_sg == 1) ? AH_TRUE : AH_FALSE, /* last segment */ ds); /* first descriptor */ - ath_desc_swap(ds); bf->bf_lastfrm = bf; bf->bf_ht = txctl->ht; -- 1.5.4.3