ap_list: Remove unused fields

Signed-hostap: Jouni Malinen <j@w1.fi>

diff --git a/src/ap/ap_list.c b/src/ap/ap_list.c
index 18090ca18c0b9feedea986cac43d2f389affced2..1d0b99ac480b481110ebc2f585d577bcbcc0e9e9 100644 (file)
--- a/src/ap/ap_list.c
+++ b/src/ap/ap_list.c
@@ -223,7 +223,6 @@ void ap_list_process_beacon(struct hostapd_iface *iface,
        struct ap_info *ap;
        struct os_time now;
        int new_ap = 0;
-       size_t len;
        int set_beacon = 0;
 
        if (iface->conf->ap_table_max_size < 1)
@@ -239,24 +238,10 @@ void ap_list_process_beacon(struct hostapd_iface *iface,
                new_ap = 1;
        }
 
-       ap->beacon_int = le_to_host16(mgmt->u.beacon.beacon_int);
-       ap->capability = le_to_host16(mgmt->u.beacon.capab_info);
-
-       if (elems->ssid) {
-               len = elems->ssid_len;
-               if (len >= sizeof(ap->ssid))
-                       len = sizeof(ap->ssid) - 1;
-               os_memcpy(ap->ssid, elems->ssid, len);
-               ap->ssid[len] = '\0';
-               ap->ssid_len = len;
-       }
-
        merge_byte_arrays(ap->supported_rates, WLAN_SUPP_RATES_MAX,
                          elems->supp_rates, elems->supp_rates_len,
                          elems->ext_supp_rates, elems->ext_supp_rates_len);
 
-       ap->wpa = elems->wpa_ie != NULL;
-
        if (elems->erp_info && elems->erp_info_len == 1)
                ap->erp = elems->erp_info[0];
        else
@@ -272,11 +257,8 @@ void ap_list_process_beacon(struct hostapd_iface *iface,
        else
                ap->ht_support = 0;
 
-       ap->num_beacons++;
        os_get_time(&now);
        ap->last_beacon = now.sec;
-       if (fi)
-               ap->datarate = fi->datarate;
 
        if (!new_ap && ap != iface->ap_list) {
                /* move AP entry into the beginning of the list so that the

diff --git a/src/ap/ap_list.h b/src/ap/ap_list.h
index f0b41259bda6e232dee219cc275c1b7f66045820..d2c82ee171b7bf6241d4e905f1f15fd578d46ad6 100644 (file)
--- a/src/ap/ap_list.h
+++ b/src/ap/ap_list.h
@@ -24,24 +24,14 @@ struct ap_info {
        struct ap_info *iter_next; /* next entry in AP iteration list */
        struct ap_info *iter_prev; /* previous entry in AP iteration list */
        u8 addr[6];
-       u16 beacon_int;
-       u16 capability;
        u8 supported_rates[WLAN_SUPP_RATES_MAX];
-       u8 ssid[33];
-       size_t ssid_len;
-       int wpa;
        int erp; /* ERP Info or -1 if ERP info element not present */
 
        int channel;
-       int datarate; /* in 100 kbps */
 
        int ht_support;
 
-       unsigned int num_beacons; /* number of beacon frames received */
        os_time_t last_beacon;
-
-       int already_seen; /* whether API call AP-NEW has already fetched
-                          * information about this AP */
 };
 
 struct ieee802_11_elems;