Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / wireless / ath / ath9k / rc.h

diff --git a/drivers/net/wireless/ath/ath9k/rc.h b/drivers/net/wireless/ath/ath9k/rc.h
index 2f46a2266ba1d2e0efeb32caef1a50eb0c13ef80..5d984b8acdb12540fc531a74186d6b7021f2759c 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/rc.h
+++ b/drivers/net/wireless/ath/ath9k/rc.h
@@ -195,7 +195,6 @@ struct ath_rc_stats {
  * @rate_max_phy: phy index for the max rate
  * @per: PER for every valid rate in %
  * @probe_interval: interval for ratectrl to probe for other rates
- * @prev_data_rix: rate idx of last data frame
  * @ht_cap: HT capabilities
  * @neg_rates: Negotatied rates
  * @neg_ht_rates: Negotiated HT rates
@@ -214,22 +213,14 @@ struct ath_rate_priv {
        u32 probe_time;
        u32 per_down_time;
        u32 probe_interval;
-       u32 prev_data_rix;
-       u32 tx_triglevel_max;
        struct ath_rateset neg_rates;
        struct ath_rateset neg_ht_rates;
-       struct ath_rate_softc *asc;
        const struct ath_rate_table *rate_table;
 
        struct dentry *debugfs_rcstats;
        struct ath_rc_stats rcstats[RATE_TABLE_SIZE];
 };
 
-#define ATH_TX_INFO_FRAME_TYPE_INTERNAL        (1 << 0)
-#define ATH_TX_INFO_FRAME_TYPE_PAUSE   (1 << 1)
-#define ATH_TX_INFO_XRETRY             (1 << 3)
-#define ATH_TX_INFO_UNDERRUN           (1 << 4)
-
 enum ath9k_internal_frame_type {
        ATH9K_IFT_NOT_INTERNAL,
        ATH9K_IFT_PAUSE,