rt2x00: Restrict interface between rt2x00link and drivers

Restrict drivers to only access link_qual structure during
link tuning. The contents of these fields are for the drivers
and all fields are allowed to be changed to values the driver
considers correct.

This means that some fields need to be moved outside of this
structure to restrict access only to rt2x00link itself.
This allows some code to be moved outside of the rt2x00.h header
and into rt2x00link.c.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 29 insertions, 28 deletions

diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index b5443148d621..e99bcacfc191 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -924,24 +924,25 @@ static void rt73usb_link_stats(struct rt2x00_dev *rt2x00dev,
         qual->false_cca = rt2x00_get_field32(reg, STA_CSR1_FALSE_CCA_ERROR);
 }
 
-static inline void rt73usb_set_vgc(struct rt2x00_dev *rt2x00dev, u8 vgc_level)
+static inline void rt73usb_set_vgc(struct rt2x00_dev *rt2x00dev,
+                                   struct link_qual *qual, u8 vgc_level)
 {
-        if (rt2x00dev->link.vgc_level != vgc_level) {
+        if (qual->vgc_level != vgc_level) {
                 rt73usb_bbp_write(rt2x00dev, 17, vgc_level);
-                rt2x00dev->link.vgc_level = vgc_level;
-                rt2x00dev->link.vgc_level_reg = vgc_level;
+                qual->vgc_level = vgc_level;
+                qual->vgc_level_reg = vgc_level;
         }
 }
 
-static void rt73usb_reset_tuner(struct rt2x00_dev *rt2x00dev)
+static void rt73usb_reset_tuner(struct rt2x00_dev *rt2x00dev,
+                                struct link_qual *qual)
 {
-        rt73usb_set_vgc(rt2x00dev, 0x20);
+        rt73usb_set_vgc(rt2x00dev, qual, 0x20);
 }
 
-static void rt73usb_link_tuner(struct rt2x00_dev *rt2x00dev)
+static void rt73usb_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);
         u8 up_bound;
         u8 low_bound;
 
@@ -957,10 +958,10 @@ static void rt73usb_link_tuner(struct rt2x00_dev *rt2x00dev)
                         up_bound += 0x10;
                 }
         } else {
-                if (rssi > -82) {
+                if (qual->rssi > -82) {
                         low_bound = 0x1c;
                         up_bound = 0x40;
-                } else if (rssi > -84) {
+                } else if (qual->rssi > -84) {
                         low_bound = 0x1c;
                         up_bound = 0x20;
                 } else {
@@ -984,32 +985,32 @@ static void rt73usb_link_tuner(struct rt2x00_dev *rt2x00dev)
         /*
          * Special big-R17 for very short distance
          */
-        if (rssi > -35) {
-                rt73usb_set_vgc(rt2x00dev, 0x60);
+        if (qual->rssi > -35) {
+                rt73usb_set_vgc(rt2x00dev, qual, 0x60);
                 return;
         }
 
         /*
          * Special big-R17 for short distance
          */
-        if (rssi >= -58) {
-                rt73usb_set_vgc(rt2x00dev, up_bound);
+        if (qual->rssi >= -58) {
+                rt73usb_set_vgc(rt2x00dev, qual, up_bound);
                 return;
         }
 
         /*
          * Special big-R17 for middle-short distance
          */
-        if (rssi >= -66) {
-                rt73usb_set_vgc(rt2x00dev, low_bound + 0x10);
+        if (qual->rssi >= -66) {
+                rt73usb_set_vgc(rt2x00dev, qual, low_bound + 0x10);
                 return;
         }
 
         /*
          * Special mid-R17 for middle distance
          */
-        if (rssi >= -74) {
-                rt73usb_set_vgc(rt2x00dev, low_bound + 0x08);
+        if (qual->rssi >= -74) {
+                rt73usb_set_vgc(rt2x00dev, qual, low_bound + 0x08);
                 return;
         }
 
@@ -1017,12 +1018,12 @@ static void rt73usb_link_tuner(struct rt2x00_dev *rt2x00dev)
          * Special case: Change up_bound based on the rssi.
          * Lower up_bound when rssi is weaker then -74 dBm.
          */
-        up_bound -= 2 * (-74 - rssi);
+        up_bound -= 2 * (-74 - qual->rssi);
         if (low_bound > up_bound)
                 up_bound = low_bound;
 
-        if (link->vgc_level > up_bound) {
-                rt73usb_set_vgc(rt2x00dev, up_bound);
+        if (qual->vgc_level > up_bound) {
+                rt73usb_set_vgc(rt2x00dev, qual, up_bound);
                 return;
         }
 
@@ -1032,12 +1033,12 @@ dynamic_cca_tune:
          * r17 does not yet exceed upper limit, continue and base
          * the r17 tuning on the false CCA count.
          */
-        if ((link->qual.false_cca > 512) && (link->vgc_level < up_bound))
-                rt73usb_set_vgc(rt2x00dev,
-                                min_t(u8, link->vgc_level + 4, up_bound));
-        else if ((link->qual.false_cca < 100) && (link->vgc_level > low_bound))
-                rt73usb_set_vgc(rt2x00dev,
-                                max_t(u8, link->vgc_level - 4, low_bound));
+        if ((qual->false_cca > 512) && (qual->vgc_level < up_bound))
+                rt73usb_set_vgc(rt2x00dev, qual,
+                                min_t(u8, qual->vgc_level + 4, up_bound));
+        else if ((qual->false_cca < 100) && (qual->vgc_level > low_bound))
+                rt73usb_set_vgc(rt2x00dev, qual,
+                                max_t(u8, qual->vgc_level - 4, low_bound));
 }
 
 /*