Compile breakage due to 16579769

[Ben Greear]

The commit below caused the compile to fail for me:

cc -c -o ../src/ap/utils.o  -MMD -O0 -Wall -g   -I/home/greearb/btbits/x64_btbits/3plibs/hostap/src -I/home/greearb/btbits/x64_btbits/3plibs/hostap/src/utils 
-DUSE_KERNEL_HEADERS -I/home/greearb/tmp/local/include -I/home/greearb/btbits/x64_btbits/3plibs/libnl/include 
-DGIT_VERSION_STR_POSTFIX=\"-hostap_2_3-5248-g1657976\" -DCONFIG_TESTING_OPTIONS -DHOSTAPD -DHOSTAPD_DUMP_STATE -DCONFIG_CTRL_IFACE_UNIX -DCONFIG_CTRL_IFACE 
-DCONFIG_IAPP -DCONFIG_RSN_PREAUTH -DCONFIG_IEEE80211W -DCONFIG_IEEE80211R -DCONFIG_IEEE80211R_AP -DCONFIG_ETH_P_OUI -DCONFIG_WNM -DCONFIG_WNM_AP 
-DCONFIG_IEEE80211N -DCONFIG_IEEE80211AC  -DCONFIG_DRIVER_HOSTAP  -DCONFIG_DRIVER_WIRED -DCONFIG_DRIVER_NL80211 -DCONFIG_LIBNL20 -I/usr/include/libnl3 
-DCONFIG_DRIVER_NONE -DEAP_SERVER_MD5 -DEAP_SERVER_TLS -DEAP_SERVER_UNAUTH_TLS -DEAP_SERVER_PEAP -DEAP_SERVER_TTLS -DEAP_SERVER_MSCHAPV2 -DEAP_SERVER_GTC 
-DEAP_SERVER_SIM -DEAP_SERVER_AKA -DEAP_SERVER_AKA_PRIME -DEAP_SERVER_PAX -DEAP_SERVER_PSK -DEAP_SERVER_SAKE -DEAP_SERVER_GPSK -DEAP_GPSK_SHA256 -DCONFIG_WPS 
-DEAP_SERVER_WSC -DCONFIG_WPS_UPNP -DCONFIG_WPS_TESTING -DEAP_SERVER_IKEV2 -DEAP_SERVER_TNC -DEAP_SERVER_IDENTITY -DEAP_SERVER -DPKCS12_FUNCS -DEAP_TLS_FUNCS 
-DCONFIG_TLSV11 -DCONFIG_TLSV12 -DTLS_DEFAULT_CIPHERS=\""DEFAULT:!EXP:!LOW"\" -DCONFIG_SHA256 -DALL_DH_GROUPS -DCONFIG_NO_RANDOM_POOL -DRADIUS_SERVER 
-DCONFIG_IPV6 -DCONFIG_DRIVER_RADIUS_ACL -DNEED_AP_MLME -DCONFIG_HS20 -DCONFIG_INTERWORKING -DCONFIG_PROXYARP -DCONFIG_DEBUG_FILE -DCONFIG_SQLITE ../src/ap/utils.c
In file included from ../src/ap/utils.c:14:0:
../src/ap/sta_info.h:255:15: error: field ‘last_tk_alg’ has incomplete type
   enum wpa_alg last_tk_alg;
                ^~~~~~~~~~~
Makefile:1182: recipe for target '../src/ap/utils.o' failed
make[1]: *** [../src/ap/utils.o] Error 1
make[1]: Leaving directory '/home/greearb/btbits/x64_btbits/3plibs/hostap/hostapd'



commit 16579769ff7bb255e101c6b77fb2c47d3735a883
Author: Jouni Malinen <j at w1.fi>
Date:   Sat Oct 14 13:41:08 2017 +0300

     Add testing functionality for resetting PN/IPN for configured keys

     This can be used to test replay protection. The "RESET_PN" command in
     wpa_supplicant and "RESET_PN <addr>" command in hostapd resets the local
     counters to zero for the last configured key. For hostapd, the address
     parameter specifies which STA this operation is for or selects GTK
     ("ff:ff:ff:ff:ff:ff") or IGTK ("ff:ff:ff:ff:ff:ff IGTK").

     This functionality is for testing purposes and included only in builds
     with CONFIG_TESTING_OPTIONS=y.

     Signed-off-by: Jouni Malinen <j at w1.fi>


This is probably because I am not compiling with MESH support.  This patch
fixes the build...this look like the correct solution?


diff --git a/src/ap/sta_info.h b/src/ap/sta_info.h
index 3fb60f6..a4d314a 100644
--- a/src/ap/sta_info.h
+++ b/src/ap/sta_info.h
@@ -9,10 +9,8 @@
  #ifndef STA_INFO_H
  #define STA_INFO_H

-#ifdef CONFIG_MESH
  /* needed for mesh_plink_state enum */
  #include "common/defs.h"
-#endif /* CONFIG_MESH */

  #include "list.h"
  #include "vlan.h"

Thanks,
Ben

-- 
Ben Greear <greearb at candelatech.com>
Candela Technologies Inc  http://www.candelatech.com