ath5k: correct packet length in tx descriptors

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / ath5k / ath5k.h

diff --git a/drivers/net/wireless/ath5k/ath5k.h b/drivers/net/wireless/ath5k/ath5k.h
index a725bb94a52d51f4118a58d58f01445e06370b59..183ffc8e62cadc4b6b78c339d7a8ec0c4febf481 100644 (file)
--- a/drivers/net/wireless/ath5k/ath5k.h
+++ b/drivers/net/wireless/ath5k/ath5k.h
@@ -821,13 +821,6 @@ struct ath5k_athchan_2ghz {
                return (false);                 \
 } while (0)
 
-enum ath5k_ant_setting {
-       AR5K_ANT_VARIABLE       = 0,    /* variable by programming */
-       AR5K_ANT_FIXED_A        = 1,    /* fixed to 11a frequencies */
-       AR5K_ANT_FIXED_B        = 2,    /* fixed to 11b frequencies */
-       AR5K_ANT_MAX            = 3,
-};
-
 /*
  * Hardware interrupt abstraction
  */
@@ -1059,6 +1052,7 @@ struct ath5k_hw {
        bool                    ah_calibration;
        bool                    ah_running;
        bool                    ah_single_chip;
+       bool                    ah_combined_mic;
        enum ath5k_rfgain       ah_rf_gain;
 
        u32                     ah_mac_srev;
@@ -1356,4 +1350,9 @@ static inline u32 ath5k_hw_bitswap(u32 val, unsigned int bits)
        return retval;
 }
 
+static inline int ath5k_pad_size(int hdrlen)
+{
+       return (hdrlen < 24) ? 0 : hdrlen & 3;
+}
+
 #endif