wl1271: Remove excess null-data template settings

The null-data template (nullfunc) is dependent on the BSSID of the
current AP only, so it needs to be updated only when the BSSID changes.

Removed excess setting of the template.

Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index 86132bb007875820c08303314e6a436f1644ea5d..0ae506a2e90b65f18bbfcfd3295110ea473da566 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -1067,11 +1067,11 @@ static int wl1271_op_config_interface(struct ieee80211_hw *hw,
                ret = wl1271_cmd_join(wl);
                if (ret < 0)
                        goto out_sleep;
-       }
 
-       ret = wl1271_cmd_build_null_data(wl);
-       if (ret < 0)
-               goto out_sleep;
+               ret = wl1271_cmd_build_null_data(wl);
+               if (ret < 0)
+                       goto out_sleep;
+       }
 
        wl->ssid_len = conf->ssid_len;
        if (wl->ssid_len)
@@ -1137,10 +1137,6 @@ static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed)
                wl->channel = channel;
        }
 
-       ret = wl1271_cmd_build_null_data(wl);
-       if (ret < 0)
-               goto out_sleep;
-
        if (conf->flags & IEEE80211_CONF_PS && !wl->psm_requested) {
                wl1271_info("psm enabled");
 
@@ -1165,7 +1161,7 @@ static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed)
        if (conf->power_level != wl->power_level) {
                ret = wl1271_acx_tx_power(wl, conf->power_level);
                if (ret < 0)
-                       goto out;
+                       goto out_sleep;
 
                wl->power_level = conf->power_level;
        }