Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
	drivers/net/wireless/ath/ar9170/main.c
	drivers/net/wireless/ath/ar9170/phy.c
	drivers/net/wireless/zd1211rw/zd_rf_rf2959.c

1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 7f10239f56a8..a2bd5feb9d5c 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -348,6 +348,11 @@ struct link {
          * to bring the device/driver back into the desired state.
          */
         struct delayed_work watchdog_work;
+
+        /*
+         * Work structure for scheduling periodic AGC adjustments.
+         */
+        struct delayed_work agc_work;
 };
 
 enum rt2x00_delayed_flags {
@@ -556,6 +561,7 @@ struct rt2x00lib_ops {
                              struct link_qual *qual);
         void (*link_tuner) (struct rt2x00_dev *rt2x00dev,
                             struct link_qual *qual, const u32 count);
+        void (*gain_calibration) (struct rt2x00_dev *rt2x00dev);
 
         /*
          * Data queue handlers.
@@ -674,7 +680,6 @@ enum rt2x00_flags {
         DRIVER_SUPPORT_CONTROL_FILTER_PSPOLL,
         DRIVER_SUPPORT_PRE_TBTT_INTERRUPT,
         DRIVER_SUPPORT_LINK_TUNING,
-        DRIVER_SUPPORT_WATCHDOG,
 
         /*
          * Driver configuration