Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-microblaze.git] / drivers / net / wireless / ath / ath11k / wmi.c

diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c
index 7b1dc19..5d9437e 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/wmi.c
+++ b/drivers/net/wireless/ath/ath11k/wmi.c
@@ -1700,7 +1700,7 @@ int ath11k_wmi_bcn_tmpl(struct ath11k *ar, u32 vdev_id,
        cmd->vdev_id = vdev_id;
        cmd->tim_ie_offset = offs->tim_offset;
 
-       if (vif->csa_active) {
+       if (vif->bss_conf.csa_active) {
                cmd->csa_switch_count_offset = offs->cntdwn_counter_offs[0];
                cmd->ext_csa_switch_count_offset = offs->cntdwn_counter_offs[1];
        }
@@ -6564,7 +6564,7 @@ static int ath11k_reg_chan_list_event(struct ath11k_base *ab, struct sk_buff *sk
 
 fallback:
        /* Fallback to older reg (by sending previous country setting
-        * again if fw has succeded and we failed to process here.
+        * again if fw has succeeded and we failed to process here.
         * The Regdomain should be uniform across driver and fw. Since the
         * FW has processed the command and sent a success status, we expect
         * this function to succeed as well. If it doesn't, CTRY needs to be
@@ -7476,7 +7476,7 @@ ath11k_wmi_process_csa_switch_count_event(struct ath11k_base *ab,
                        continue;
                }
 
-               if (arvif->is_up && arvif->vif->csa_active)
+               if (arvif->is_up && arvif->vif->bss_conf.csa_active)
                        ieee80211_csa_finish(arvif->vif);
        }
        rcu_read_unlock();