ath9k: We don't support non-HT devices, so remove superfluous code.

Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath9k/xmit.c b/drivers/net/wireless/ath9k/xmit.c
index 8937728b03018a30a204913f49ba85c92e06c88b..44735b6d9f044307ee8c55bd4fd0c025918dd5d5 100644 (file)
--- a/drivers/net/wireless/ath9k/xmit.c
+++ b/drivers/net/wireless/ath9k/xmit.c
@@ -14,10 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/*
- * Implementation of transmit path.
- */
-
 #include "core.h"
 
 #define BITS_PER_BYTE           8
@@ -698,41 +694,6 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf)
                        series[i].RateFlags |= ATH9K_RATESERIES_RTS_CTS;
        }
 
-       /*
-        * For non-HT devices, calculate RTS/CTS duration in software
-        * and disable multi-rate retry.
-        */
-       if (flags && !(ah->ah_caps.hw_caps & ATH9K_HW_CAP_HT)) {
-               /*
-                * Compute the transmit duration based on the frame
-                * size and the size of an ACK frame.  We call into the
-                * HAL to do the computation since it depends on the
-                * characteristics of the actual PHY being used.
-                *
-                * NB: CTS is assumed the same size as an ACK so we can
-                *     use the precalculated ACK durations.
-                */
-               if (flags & ATH9K_TXDESC_RTSENA) {    /* SIFS + CTS */
-                       ctsduration += bf_isshpreamble(bf) ?
-                               rt->info[cix].spAckDuration :
-                               rt->info[cix].lpAckDuration;
-               }
-
-               ctsduration += series[0].PktDuration;
-
-               if ((bf->bf_flags & ATH9K_TXDESC_NOACK) == 0) { /* SIFS + ACK */
-                       ctsduration += bf_isshpreamble(bf) ?
-                               rt->info[rix].spAckDuration :
-                               rt->info[rix].lpAckDuration;
-               }
-
-               /*
-                * Disable multi-rate retry when using RTS/CTS by clearing
-                * series 1, 2 and 3.
-                */
-               memset(&series[1], 0, sizeof(struct ath9k_11n_rate_series) * 3);
-       }
-
        /*
         * set dur_update_en for l-sig computation except for PS-Poll frames
         */