1 files changed, 25 insertions, 25 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index 5b98a74a2554..fb86e2c55248 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -639,31 +639,31 @@ static void rt2500pci_link_stats(struct rt2x00_dev *rt2x00dev,
         qual->false_cca = rt2x00_get_field32(reg, CNT3_FALSE_CCA);
 }
 
-static inline void rt2500pci_set_vgc(struct rt2x00_dev *rt2x00dev, u8 vgc_level)
+static inline void rt2500pci_set_vgc(struct rt2x00_dev *rt2x00dev,
+                                     struct link_qual *qual, u8 vgc_level)
 {
-        if (rt2x00dev->link.vgc_level_reg != vgc_level) {
+        if (qual->vgc_level_reg != vgc_level) {
                 rt2500pci_bbp_write(rt2x00dev, 17, vgc_level);
-                rt2x00dev->link.vgc_level_reg = vgc_level;
+                qual->vgc_level_reg = vgc_level;
         }
 }
 
-static void rt2500pci_reset_tuner(struct rt2x00_dev *rt2x00dev)
+static void rt2500pci_reset_tuner(struct rt2x00_dev *rt2x00dev,
+                                  struct link_qual *qual)
 {
-        rt2500pci_set_vgc(rt2x00dev, 0x48);
+        rt2500pci_set_vgc(rt2x00dev, qual, 0x48);
 }
 
-static void rt2500pci_link_tuner(struct rt2x00_dev *rt2x00dev)
+static void rt2500pci_link_tuner(struct rt2x00_dev *rt2x00dev,
+                                 struct link_qual *qual, const u32 count)
 {
-        struct link *link = &rt2x00dev->link;
-        int rssi = rt2x00_get_link_rssi(link);
-
         /*
          * To prevent collisions with MAC ASIC on chipsets
          * up to version C the link tuning should halt after 20
          * seconds while being associated.
          */
         if (rt2x00_rev(&rt2x00dev->chip) < RT2560_VERSION_D &&
-            rt2x00dev->intf_associated && link->count > 20)
+            rt2x00dev->intf_associated && count > 20)
                 return;
 
         /*
@@ -681,25 +681,25 @@ static void rt2500pci_link_tuner(struct rt2x00_dev *rt2x00dev)
          * then corrupt the R17 tuning. To remidy this the tuning should
          * be stopped (While making sure the R17 value will not exceed limits)
          */
-        if (rssi < -80 && link->count > 20) {
-                if (link->vgc_level_reg >= 0x41)
-                        rt2500pci_set_vgc(rt2x00dev, link->vgc_level);
+        if (qual->rssi < -80 && count > 20) {
+                if (qual->vgc_level_reg >= 0x41)
+                        rt2500pci_set_vgc(rt2x00dev, qual, qual->vgc_level);
                 return;
         }
 
         /*
          * Special big-R17 for short distance
          */
-        if (rssi >= -58) {
-                rt2500pci_set_vgc(rt2x00dev, 0x50);
+        if (qual->rssi >= -58) {
+                rt2500pci_set_vgc(rt2x00dev, qual, 0x50);
                 return;
         }
 
         /*
          * Special mid-R17 for middle distance
          */
-        if (rssi >= -74) {
-                rt2500pci_set_vgc(rt2x00dev, 0x41);
+        if (qual->rssi >= -74) {
+                rt2500pci_set_vgc(rt2x00dev, qual, 0x41);
                 return;
         }
 
@@ -707,8 +707,8 @@ static void rt2500pci_link_tuner(struct rt2x00_dev *rt2x00dev)
          * Leave short or middle distance condition, restore r17
          * to the dynamic tuning range.
          */
-        if (link->vgc_level_reg >= 0x41) {
-                rt2500pci_set_vgc(rt2x00dev, link->vgc_level);
+        if (qual->vgc_level_reg >= 0x41) {
+                rt2500pci_set_vgc(rt2x00dev, qual, qual->vgc_level);
                 return;
         }
 
@@ -718,12 +718,12 @@ dynamic_cca_tune:
          * R17 is inside the dynamic tuning range,
          * start tuning the link based on the false cca counter.
          */
-        if (link->qual.false_cca > 512 && link->vgc_level_reg < 0x40) {
-                rt2500pci_set_vgc(rt2x00dev, ++link->vgc_level_reg);
-                link->vgc_level = link->vgc_level_reg;
-        } else if (link->qual.false_cca < 100 && link->vgc_level_reg > 0x32) {
-                rt2500pci_set_vgc(rt2x00dev, --link->vgc_level_reg);
-                link->vgc_level = link->vgc_level_reg;
+        if (qual->false_cca > 512 && qual->vgc_level_reg < 0x40) {
+                rt2500pci_set_vgc(rt2x00dev, qual, ++qual->vgc_level_reg);
+                qual->vgc_level = qual->vgc_level_reg;
+        } else if (qual->false_cca < 100 && qual->vgc_level_reg > 0x32) {
+                rt2500pci_set_vgc(rt2x00dev, qual, --qual->vgc_level_reg);
+                qual->vgc_level = qual->vgc_level_reg;
         }
 }