rt2x00: Remove usage of deprecated radio_enabled & IEEE80211_CONF_CHANGE_RADIO_ENABLED

In the config() callback function the fields radio_enabled and
the change flag IEEE80211_CONF_CHANGE_RADIO_ENABLED have been
deprecated. This removes the usage of those fields by improving
antenna change detection in the antenna configuration function.

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

1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00link.c b/drivers/net/wireless/rt2x00/rt2x00link.c
index 917831689ccd..fe951dc9bacf 100644
--- a/drivers/net/wireless/rt2x00/rt2x00link.c
+++ b/drivers/net/wireless/rt2x00/rt2x00link.c
@@ -219,6 +219,7 @@ static void rt2x00lib_antenna_diversity_eval(struct rt2x00_dev *rt2x00dev)
 static void 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
@@ -226,13 +227,13 @@ static void rt2x00lib_antenna_diversity(struct rt2x00_dev *rt2x00dev)
          * Always perform this check since within the link
          * tuner interval the configuration might have changed.
          */
-        ant->flags &= ~ANTENNA_RX_DIVERSITY;
-        ant->flags &= ~ANTENNA_TX_DIVERSITY;
+        flags &= ~ANTENNA_RX_DIVERSITY;
+        flags &= ~ANTENNA_TX_DIVERSITY;
 
         if (rt2x00dev->default_ant.rx == ANTENNA_SW_DIVERSITY)
-                ant->flags |= ANTENNA_RX_DIVERSITY;
+                flags |= ANTENNA_RX_DIVERSITY;
         if (rt2x00dev->default_ant.tx == ANTENNA_SW_DIVERSITY)
-                ant->flags |= ANTENNA_TX_DIVERSITY;
+                flags |= ANTENNA_TX_DIVERSITY;
 
         if (!(ant->flags & ANTENNA_RX_DIVERSITY) &&
             !(ant->flags & ANTENNA_TX_DIVERSITY)) {
@@ -240,6 +241,9 @@ static void rt2x00lib_antenna_diversity(struct rt2x00_dev *rt2x00dev)
                 return;
         }
 
+        /* 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