ANDROID_VENDOR_SUB_COMMAND: move ORDER NAN commads by value

The broadcom HAL we imported use as a base in this repository
doesn't work with the brcmfmac upstream driver in Linux: even
if nonfree firwmares are found on the device (for instance
because users added them manually), Replicant can scan the
networks but it can't connect to WPA2 networks even with the
right password, and when the connection fails we see some
errors with the statistics reporting (from adb logcat -b main):
    [...] D WifiNl80211Manager: Scan result ready event
    [...] D WifiNative: Scan result ready event
    [...] E WifiVendorHal: getWifiLinkLayerStats_1_3_Internal(l.973)
          failed {.code = ERROR_UNKNOWN, .description = unknown error}

This might be because for some reasons the Broadcom HAL depends
on the bcmdhd kernel driver that we don't want to use because
it's an out of tree kernel driver and we want to use the upstream
kernel drivers instead.

So we need to modify this Broadcom Wi-Fi HAL not to depend on
the bcmdhd driver.

Since there is also a Wi-Fi hal in the device/linaro/poplar
repository that was derived from this Broadcom Wi-Fi HAL, we
could import it.

That modified Wi-Fi HAL has been imported in device/linaro/poplar[1]
in the android-11.0.0_r17 tag by the following commit:
    commit d9bd822cf11ffa4c2813e6027b8172a400f93505
    Author: Shawn Guo <shawn.guo@linaro.org>
    Date:   Wed Oct 10 10:24:47 2018 +0800

        Add poplar wifi hal source code

        The poplar wifi hal derives from bcmdhd one with a few changes below.

         - No GetChannelListCommand support for gscan.
         - Use different vendor data structure without internal radio statistics
           structure conversion for link_layer_stats.
         - Drop BCMDHD_64_BIT_IPC build option support for wpa_supplicant_8_lib.

        We should probably consolidate it with bcmdhd at hardware/ folder
        level, but let's start from maintaining it at poplar device level before
        we find it useful for more devices.

        Change-Id: Ibef0f75f02f184b4feb7ba624407ce2f26984962

However the amount of changes are way too big to be reviewed, so we
need to split them up.

Since the reorder done by this commit was also done by the "Add
poplar wifi hal source code" commit, we can simply split that
away in order to make review more easy.

[1]https://android.googlesource.com/device/linaro/poplar

GNUtoo: commit message, rebase and split
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/wifi_hal/common.h b/wifi_hal/common.h
index 568b5bd..b5fbe09 100755
--- a/wifi_hal/common.h
+++ b/wifi_hal/common.h
@@ -88,14 +88,14 @@ typedef enum {
     ANDROID_NL80211_SUBCMD_DEBUG_RANGE_START = 0x1400,
     ANDROID_NL80211_SUBCMD_DEBUG_RANGE_END   = 0x14FF,
 
-    /* define all NAN related commands between 0x1700 and 0x17FF */
-    ANDROID_NL80211_SUBCMD_NAN_RANGE_START = 0x1700,
-    ANDROID_NL80211_SUBCMD_NAN_RANGE_END   = 0x17FF,
-
     /* define all wifi offload related commands between 0x1600 and 0x16FF */
     ANDROID_NL80211_SUBCMD_WIFI_OFFLOAD_RANGE_START = 0x1600,
     ANDROID_NL80211_SUBCMD_WIFI_OFFLOAD_RANGE_END   = 0x16FF,
 
+    /* define all NAN related commands between 0x1700 and 0x17FF */
+    ANDROID_NL80211_SUBCMD_NAN_RANGE_START = 0x1700,
+    ANDROID_NL80211_SUBCMD_NAN_RANGE_END   = 0x17FF,
+
     /* define all Android Packet Filter related commands between 0x1800 and 0x18FF */
     ANDROID_NL80211_SUBCMD_PKT_FILTER_RANGE_START = 0x1800,
     ANDROID_NL80211_SUBCMD_PKT_FILTER_RANGE_END   = 0x18FF,