Remove unused phytype RX info variable

diff --git a/hostapd/ap_list.c b/hostapd/ap_list.c
index 1807055..ed635bd 100644 (file)
--- a/hostapd/ap_list.c
+++ b/hostapd/ap_list.c
@@ -29,44 +29,6 @@
 #include "drivers/driver.h"
 
 
-struct ieee80211_frame_info {
-       u32 version;
-       u32 length;
-       u64 mactime;
-       u64 hosttime;
-       u32 phytype;
-       u32 channel;
-       u32 datarate;
-       u32 antenna;
-       u32 priority;
-       u32 ssi_type;
-       u32 ssi_signal;
-       u32 ssi_noise;
-       u32 preamble;
-       u32 encoding;
-
-       /* Note: this structure is otherwise identical to capture format used
-        * in linux-wlan-ng, but this additional field is used to provide meta
-        * data about the frame to hostapd. This was the easiest method for
-        * providing this information, but this might change in the future. */
-       u32 msg_type;
-} __attribute__ ((packed));
-
-
-enum ieee80211_phytype {
-       ieee80211_phytype_fhss_dot11_97  = 1,
-       ieee80211_phytype_dsss_dot11_97  = 2,
-       ieee80211_phytype_irbaseband     = 3,
-       ieee80211_phytype_dsss_dot11_b   = 4,
-       ieee80211_phytype_pbcc_dot11_b   = 5,
-       ieee80211_phytype_ofdm_dot11_g   = 6,
-       ieee80211_phytype_pbcc_dot11_g   = 7,
-       ieee80211_phytype_ofdm_dot11_a   = 8,
-       ieee80211_phytype_dsss_dot11_turbog = 255,
-       ieee80211_phytype_dsss_dot11_turbo = 256,
-};
-
-
 /* AP list is a double linked list with head->prev pointing to the end of the
  * list and tail->next = NULL. Entries are moved to the head of the list
  * whenever a beacon has been received from the AP in question. The tail entry
@@ -78,7 +40,6 @@ static int ap_list_beacon_olbc(struct hostapd_iface *iface, struct ap_info *ap)
        int i;
 
        if (iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G ||
-           ap->phytype != ieee80211_phytype_pbcc_dot11_g ||
            iface->conf->channel != ap->channel)
                return 0;
 
@@ -342,7 +303,6 @@ void ap_list_process_beacon(struct hostapd_iface *iface,
        ap->num_beacons++;
        time(&ap->last_beacon);
        if (fi) {
-               ap->phytype = fi->phytype;
                ap->ssi_signal = fi->ssi_signal;
                ap->datarate = fi->datarate;
        }

diff --git a/hostapd/ap_list.h b/hostapd/ap_list.h
index 839f5a9..8952fab 100644 (file)
--- a/hostapd/ap_list.h
+++ b/hostapd/ap_list.h
@@ -39,7 +39,6 @@ struct ap_info {
        int wpa;
        int erp; /* ERP Info or -1 if ERP info element not present */
 
-       int phytype; /* .11a / .11b / .11g / Atheros Turbo */
        int channel;
        int datarate; /* in 100 kbps */
        int ssi_signal;

diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index 8b63d54..0cfafbc 100644 (file)
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -1584,7 +1584,6 @@ void hostapd_eapol_receive(struct hostapd_data *hapd, const u8 *sa,
                           const u8 *buf, size_t len);
 
 struct hostapd_frame_info {
-       u32 phytype;
        u32 channel;
        u32 datarate;
        u32 ssi_signal;

diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index 34c9d22..fd31bf5 100644 (file)
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -3003,7 +3003,6 @@ static void handle_monitor_read(int sock, void *eloop_ctx, void *sock_ctx)
                case IEEE80211_RADIOTAP_CHANNEL:
                        /* TODO convert from freq/flags to channel number
                        hfi.channel = XXX;
-                       hfi.phytype = XXX;
                         */
                        break;
                case IEEE80211_RADIOTAP_RATE: