hostapd: Move CSA parameters to hostapd_data

[mech_eap.git] / src / ap / beacon.c

diff --git a/src/ap/beacon.c b/src/ap/beacon.c
index 73dffe2..b3b6149 100644 (file)
--- a/src/ap/beacon.c
+++ b/src/ap/beacon.c
@@ -265,18 +265,18 @@ static u8 * hostapd_eid_csa(struct hostapd_data *hapd, u8 *eid)
 {
        u8 chan;
 
-       if (!hapd->iface->cs_freq_params.freq)
+       if (!hapd->cs_freq_params.freq)
                return eid;
 
-       if (ieee80211_freq_to_chan(hapd->iface->cs_freq_params.freq, &chan) ==
+       if (ieee80211_freq_to_chan(hapd->cs_freq_params.freq, &chan) ==
            NUM_HOSTAPD_MODES)
                return eid;
 
        *eid++ = WLAN_EID_CHANNEL_SWITCH;
        *eid++ = 3;
-       *eid++ = hapd->iface->cs_block_tx;
+       *eid++ = hapd->cs_block_tx;
        *eid++ = chan;
-       *eid++ = hapd->iface->cs_count;
+       *eid++ = hapd->cs_count;
 
        return eid;
 }
@@ -286,12 +286,12 @@ static u8 * hostapd_eid_secondary_channel(struct hostapd_data *hapd, u8 *eid)
 {
        u8 sec_ch;
 
-       if (!hapd->iface->cs_freq_params.sec_channel_offset)
+       if (!hapd->cs_freq_params.sec_channel_offset)
                return eid;
 
-       if (hapd->iface->cs_freq_params.sec_channel_offset == -1)
+       if (hapd->cs_freq_params.sec_channel_offset == -1)
                sec_ch = HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW;
-       else if (hapd->iface->cs_freq_params.sec_channel_offset == 1)
+       else if (hapd->cs_freq_params.sec_channel_offset == 1)
                sec_ch = HT_INFO_HT_PARAM_SECONDARY_CHNL_ABOVE;
        else
                return eid;
@@ -409,7 +409,7 @@ static u8 * hostapd_gen_probe_resp(struct hostapd_data *hapd,
        pos = hostapd_eid_roaming_consortium(hapd, pos);
 
        pos = hostapd_add_csa_elems(hapd, pos, (u8 *)resp,
-                                   &hapd->iface->cs_c_off_proberesp);
+                                   &hapd->cs_c_off_proberesp);
 #ifdef CONFIG_IEEE80211AC
        pos = hostapd_eid_vht_capabilities(hapd, pos);
        pos = hostapd_eid_vht_operation(hapd, pos);
@@ -824,7 +824,7 @@ int ieee802_11_build_ap_params(struct hostapd_data *hapd,
        tailpos = hostapd_eid_adv_proto(hapd, tailpos);
        tailpos = hostapd_eid_roaming_consortium(hapd, tailpos);
        tailpos = hostapd_add_csa_elems(hapd, tailpos, tail,
-                                       &hapd->iface->cs_c_off_beacon);
+                                       &hapd->cs_c_off_beacon);
 #ifdef CONFIG_IEEE80211AC
        tailpos = hostapd_eid_vht_capabilities(hapd, tailpos);
        tailpos = hostapd_eid_vht_operation(hapd, tailpos);
@@ -957,7 +957,7 @@ int ieee802_11_set_beacon(struct hostapd_data *hapd)
        struct wpabuf *beacon, *proberesp, *assocresp;
        int res, ret = -1;
 
-       if (hapd->iface->csa_in_progress) {
+       if (hapd->csa_in_progress) {
                wpa_printf(MSG_ERROR, "Cannot set beacons during CSA period");
                return -1;
        }