rt2x00: Don't alter rt2x00dev->default_ant

rt2x00dev->default_ant should be initialized once by the driver,
and should not be changed afterwards. Because rt2x00lib_config_antenna()
was using a reference to the struct antenna_setup it actually had the oppurtunity
to change the default antenna setting and it actually did that during the validation.

Instead of passing a pointer to antenna_setup the entire structure should be copied.

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

diff --git a/drivers/net/wireless/rt2x00/rt2x00config.c b/drivers/net/wireless/rt2x00/rt2x00config.c
index c6e0bcf78e9e76de7b9bc1dc8f8dac8aea528a3b..3845316ccd3941624ae0e4e0674d1fc52f48f51f 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00config.c
+++ b/drivers/net/wireless/rt2x00/rt2x00config.c
@@ -124,7 +124,7 @@ enum antenna rt2x00lib_config_antenna_check(enum antenna current_ant,
 }
 
 void rt2x00lib_config_antenna(struct rt2x00_dev *rt2x00dev,
-                             struct antenna_setup *ant)
+                             struct antenna_setup ant)
 {
        struct antenna_setup *def = &rt2x00dev->default_ant;
        struct antenna_setup *active = &rt2x00dev->link.ant.active;
@@ -138,10 +138,10 @@ void rt2x00lib_config_antenna(struct rt2x00_dev *rt2x00dev,
         * might have caused that we restore back to the already
         * active setting. If that has happened we can quit.
         */
-       ant->rx = rt2x00lib_config_antenna_check(ant->rx, def->rx);
-       ant->tx = rt2x00lib_config_antenna_check(ant->tx, def->tx);
+       ant.rx = rt2x00lib_config_antenna_check(ant.rx, def->rx);
+       ant.tx = rt2x00lib_config_antenna_check(ant.tx, def->tx);
 
-       if (ant->rx == active->rx && ant->tx == active->tx)
+       if (ant.rx == active->rx && ant.tx == active->tx)
                return;
 
        /*
@@ -156,11 +156,11 @@ void rt2x00lib_config_antenna(struct rt2x00_dev *rt2x00dev,
         * The latter is required since we need to recalibrate the
         * noise-sensitivity ratio for the new setup.
         */
-       rt2x00dev->ops->lib->config_ant(rt2x00dev, ant);
+       rt2x00dev->ops->lib->config_ant(rt2x00dev, &ant);
 
        rt2x00link_reset_tuner(rt2x00dev, true);
 
-       memcpy(active, ant, sizeof(*ant));
+       memcpy(active, &ant, sizeof(ant));
 
        if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
                rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON_LINK);

diff --git a/drivers/net/wireless/rt2x00/rt2x00lib.h b/drivers/net/wireless/rt2x00/rt2x00lib.h
index 512fa2bc3a10817d9e98ab70001545aba5457a3f..eeb2881e818e72a8c1afc25b795042e70c68b7f2 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00lib.h
+++ b/drivers/net/wireless/rt2x00/rt2x00lib.h
@@ -88,7 +88,7 @@ void rt2x00lib_config_erp(struct rt2x00_dev *rt2x00dev,
                          struct rt2x00_intf *intf,
                          struct ieee80211_bss_conf *conf);
 void rt2x00lib_config_antenna(struct rt2x00_dev *rt2x00dev,
-                             struct antenna_setup *ant);
+                             struct antenna_setup ant);
 void rt2x00lib_config(struct rt2x00_dev *rt2x00dev,
                      struct ieee80211_conf *conf,
                      const unsigned int changed_flags);

diff --git a/drivers/net/wireless/rt2x00/rt2x00link.c b/drivers/net/wireless/rt2x00/rt2x00link.c
index 32570758e67c562a2fd0a5b8a8e8111acee0459d..79915687e744ceecc218d1a5b55fc89bf69fedf5 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00link.c
+++ b/drivers/net/wireless/rt2x00/rt2x00link.c
@@ -173,7 +173,7 @@ static void rt2x00lib_antenna_diversity_sample(struct rt2x00_dev *rt2x00dev)
        if (ant->flags & ANTENNA_TX_DIVERSITY)
                new_ant.tx = (sample_a > sample_b) ? ANTENNA_A : ANTENNA_B;
 
-       rt2x00lib_config_antenna(rt2x00dev, &new_ant);
+       rt2x00lib_config_antenna(rt2x00dev, new_ant);
 }
 
 static void rt2x00lib_antenna_diversity_eval(struct rt2x00_dev *rt2x00dev)
@@ -213,7 +213,7 @@ static void rt2x00lib_antenna_diversity_eval(struct rt2x00_dev *rt2x00dev)
        if (ant->flags & ANTENNA_TX_DIVERSITY)
                new_ant.tx = (new_ant.tx == ANTENNA_A) ? ANTENNA_B : ANTENNA_A;
 
-       rt2x00lib_config_antenna(rt2x00dev, &new_ant);
+       rt2x00lib_config_antenna(rt2x00dev, new_ant);
 }
 
 static void rt2x00lib_antenna_diversity(struct rt2x00_dev *rt2x00dev)

diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index 9d31c23b92fa03c0c7bb42c73fd58f57d0b074c7..7de1a2cdcf8c15942a1c0ef2ce956965c4697e02 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -378,7 +378,7 @@ int rt2x00mac_config(struct ieee80211_hw *hw, u32 changed)
                 */
                if (changed & IEEE80211_CONF_CHANGE_RADIO_ENABLED)
                        rt2x00lib_config_antenna(rt2x00dev,
-                                                &rt2x00dev->default_ant);
+                                                rt2x00dev->default_ant);
 
                /* Turn RX back on */
                rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON);