am "Wifi hal headers: PNO thru g-scan and g-scan exponential channel buckets"

merged from goog/mirror-m-wireless-internal-release
73212d1 Wifi hal headers: PNO thru g-scan and g-scan exponential channel buckets

Change-Id: Ie352da4ae47dea61a8335b556c32482ca4f7487e

diff --cc include/hardware_legacy/gscan.h
index fed7c0e,0b639b9..fe92b12
--- 1/include/hardware_legacy/gscan.h
--- 2/include/hardware_legacy/gscan.h
+++ b/include/hardware_legacy/gscan.h
@@@ -16,10 -16,11 +16,11 @@@ typedef enum 
      WIFI_BAND_ABG_WITH_DFS = 7,             // 2.4 GHz + 5 GHz with DFS
  } wifi_band;
  
 -const unsigned MAX_CHANNELS                = 16;
 -const unsigned MAX_BUCKETS                 = 16;
 -const unsigned MAX_HOTLIST_APS             = 128;
 -const unsigned MAX_SIGNIFICANT_CHANGE_APS  = 64;
 -const unsigned MAX_PNO_SSID                = 128;
 +#define MAX_CHANNELS                16
 +#define MAX_BUCKETS                 16
 +#define MAX_HOTLIST_APS             128
 +#define MAX_SIGNIFICANT_CHANGE_APS  64
++#define MAX_PNO_SSID                128;
  
  wifi_error wifi_get_valid_channels(wifi_interface_handle handle,
          int band, int max_channels, wifi_channel *channels, int *num_channels);

diff --cc include/hardware_legacy/wifi_hal.h
Simple merge