1 files changed, 54 insertions, 24 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00link.c b/drivers/net/wireless/rt2x00/rt2x00link.c
index 666cef3f8472..ea10b0068f82 100644
--- a/drivers/net/wireless/rt2x00/rt2x00link.c
+++ b/drivers/net/wireless/rt2x00/rt2x00link.c
@@ -67,7 +67,7 @@
             (__avg).avg_weight  ? \
                 ((((__avg).avg_weight * ((AVG_SAMPLES) - 1)) + \
                   ((__val) * (AVG_FACTOR))) / \
-                 (AVG_SAMPLES) ) : \
+                 (AVG_SAMPLES)) : \
                 ((__val) * (AVG_FACTOR)); \
         __new.avg = __new.avg_weight / (AVG_FACTOR); \
         __new; \
@@ -188,31 +188,17 @@ static void rt2x00lib_antenna_diversity_eval(struct rt2x00_dev *rt2x00dev)
 static bool rt2x00lib_antenna_diversity(struct rt2x00_dev *rt2x00dev)
 {
         struct link_ant *ant = &rt2x00dev->link.ant;
-        unsigned int flags = ant->flags;
 
         /*
          * Determine if software diversity is enabled for
          * either the TX or RX antenna (or both).
-         * Always perform this check since within the link
-         * tuner interval the configuration might have changed.
          */
-        flags &= ~ANTENNA_RX_DIVERSITY;
-        flags &= ~ANTENNA_TX_DIVERSITY;
-
-        if (rt2x00dev->default_ant.rx == ANTENNA_SW_DIVERSITY)
-                flags |= ANTENNA_RX_DIVERSITY;
-        if (rt2x00dev->default_ant.tx == ANTENNA_SW_DIVERSITY)
-                flags |= ANTENNA_TX_DIVERSITY;
-
         if (!(ant->flags & ANTENNA_RX_DIVERSITY) &&
             !(ant->flags & ANTENNA_TX_DIVERSITY)) {
                 ant->flags = 0;
                 return true;
         }
 
-        /* Update flags */
-        ant->flags = flags;
-
         /*
          * If we have only sampled the data over the last period
          * we should now harvest the data. Otherwise just evaluate
@@ -240,6 +226,12 @@ void rt2x00link_update_stats(struct rt2x00_dev *rt2x00dev,
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
 
         /*
+         * No need to update the stats for !=STA interfaces
+         */
+        if (!rt2x00dev->intf_sta_count)
+                return;
+
+        /*
          * Frame was received successfully since non-succesfull
          * frames would have been dropped by the hardware.
          */
@@ -281,7 +273,7 @@ void rt2x00link_start_tuner(struct rt2x00_dev *rt2x00dev)
         /**
          * While scanning, link tuning is disabled. By default
          * the most sensitive settings will be used to make sure
-         * that all beacons and probe responses will be recieved
+         * that all beacons and probe responses will be received
          * during the scan.
          */
         if (test_bit(DEVICE_STATE_SCANNING, &rt2x00dev->flags))
@@ -381,7 +373,7 @@ static void rt2x00link_tuner(struct work_struct *work)
          * do not support link tuning at all, while other devices can disable
          * the feature from the EEPROM.
          */
-        if (test_bit(DRIVER_SUPPORT_LINK_TUNING, &rt2x00dev->flags))
+        if (test_bit(CAPABILITY_LINK_TUNING, &rt2x00dev->cap_flags))
                 rt2x00dev->ops->lib->link_tuner(rt2x00dev, qual, link->count);
 
         /*
@@ -411,12 +403,11 @@ void rt2x00link_start_watchdog(struct rt2x00_dev *rt2x00dev)
 {
         struct link *link = &rt2x00dev->link;
 
-        if (!test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags) ||
-            !test_bit(DRIVER_SUPPORT_WATCHDOG, &rt2x00dev->flags))
-                return;
-
-        ieee80211_queue_delayed_work(rt2x00dev->hw,
-                                     &link->watchdog_work, WATCHDOG_INTERVAL);
+        if (test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags) &&
+            rt2x00dev->ops->lib->watchdog)
+                ieee80211_queue_delayed_work(rt2x00dev->hw,
+                                             &link->watchdog_work,
+                                             WATCHDOG_INTERVAL);
 }
 
 void rt2x00link_stop_watchdog(struct rt2x00_dev *rt2x00dev)
@@ -441,11 +432,50 @@ static void rt2x00link_watchdog(struct work_struct *work)
 
         if (test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags))
                 ieee80211_queue_delayed_work(rt2x00dev->hw,
-                                             &link->watchdog_work, WATCHDOG_INTERVAL);
+                                             &link->watchdog_work,
+                                             WATCHDOG_INTERVAL);
+}
+
+void rt2x00link_start_agc(struct rt2x00_dev *rt2x00dev)
+{
+        struct link *link = &rt2x00dev->link;
+
+        if (test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags) &&
+            rt2x00dev->ops->lib->gain_calibration)
+                ieee80211_queue_delayed_work(rt2x00dev->hw,
+                                             &link->agc_work,
+                                             AGC_INTERVAL);
+}
+
+void rt2x00link_stop_agc(struct rt2x00_dev *rt2x00dev)
+{
+        cancel_delayed_work_sync(&rt2x00dev->link.agc_work);
+}
+
+static void rt2x00link_agc(struct work_struct *work)
+{
+        struct rt2x00_dev *rt2x00dev =
+            container_of(work, struct rt2x00_dev, link.agc_work.work);
+        struct link *link = &rt2x00dev->link;
+
+        /*
+         * When the radio is shutting down we should
+         * immediately cease the watchdog monitoring.
+         */
+        if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
+                return;
+
+        rt2x00dev->ops->lib->gain_calibration(rt2x00dev);
+
+        if (test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags))
+                ieee80211_queue_delayed_work(rt2x00dev->hw,
+                                             &link->agc_work,
+                                             AGC_INTERVAL);
 }
 
 void rt2x00link_register(struct rt2x00_dev *rt2x00dev)
 {
+        INIT_DELAYED_WORK(&rt2x00dev->link.agc_work, rt2x00link_agc);
         INIT_DELAYED_WORK(&rt2x00dev->link.watchdog_work, rt2x00link_watchdog);
         INIT_DELAYED_WORK(&rt2x00dev->link.work, rt2x00link_tuner);
 }