ath6kl: Fix merge error in ath6kl_set_ies()

Portion of the commit id 080eec4fb4 ("ath6kl: Clear the IE in firmware
if not set") was overwritten by mistake due to a merge
conflict. This patch fixes the code back to how it should be.

kvalo: more details to the commit log

Signed-off-by: Aarthi Thiruvengadam <athiruve@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index 37908e60e863b7506c51db1d25d07780e9c95cd6..5ecc53af3ac6ae94528c8894047da82ac6e9d1ca 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -2366,30 +2366,27 @@ static int ath6kl_set_ies(struct ath6kl_vif *vif,
        struct ath6kl *ar = vif->ar;
        int res;
 
-       if (info->beacon_ies) {
-               res = ath6kl_wmi_set_appie_cmd(ar->wmi, vif->fw_vif_idx,
-                                              WMI_FRAME_BEACON,
-                                              info->beacon_ies,
-                                              info->beacon_ies_len);
-               if (res)
-                       return res;
-       }
-
-       if (info->proberesp_ies) {
-               res = ath6kl_set_ap_probe_resp_ies(vif, info->proberesp_ies,
-                                                  info->proberesp_ies_len);
-               if (res)
-                       return res;
-       }
-
-       if (info->assocresp_ies) {
-               res = ath6kl_wmi_set_appie_cmd(ar->wmi, vif->fw_vif_idx,
-                                              WMI_FRAME_ASSOC_RESP,
-                                              info->assocresp_ies,
-                                              info->assocresp_ies_len);
-               if (res)
-                       return res;
-       }
+       /* this also clears IE in fw if it's not set */
+       res = ath6kl_wmi_set_appie_cmd(ar->wmi, vif->fw_vif_idx,
+                                      WMI_FRAME_BEACON,
+                                      info->beacon_ies,
+                                      info->beacon_ies_len);
+       if (res)
+               return res;
+
+       /* this also clears IE in fw if it's not set */
+       res = ath6kl_set_ap_probe_resp_ies(vif, info->proberesp_ies,
+                                          info->proberesp_ies_len);
+       if (res)
+               return res;
+
+       /* this also clears IE in fw if it's not set */
+       res = ath6kl_wmi_set_appie_cmd(ar->wmi, vif->fw_vif_idx,
+                                      WMI_FRAME_ASSOC_RESP,
+                                      info->assocresp_ies,
+                                      info->assocresp_ies_len);
+       if (res)
+               return res;
 
        return 0;
 }