diff --git a/components/action_oui/core/src/wlan_action_oui_parse.c b/components/action_oui/core/src/wlan_action_oui_parse.c index 13e007a714..615af7e206 100644 --- a/components/action_oui/core/src/wlan_action_oui_parse.c +++ b/components/action_oui/core/src/wlan_action_oui_parse.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2019 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -846,16 +846,12 @@ check_for_vendor_ap_capabilities(struct action_oui_extension *extension, } } - if (extension->info_mask & ACTION_OUI_INFO_AP_CAPABILITY_BAND) { - if ((*extension->capability & - ACTION_OUI_CAPABILITY_2G_BAND_MASK) && - !attr->enable_2g) - return false; - if ((*extension->capability & - ACTION_CAPABILITY_5G_BAND_MASK) && - !attr->enable_5g) - return false; - } + if (extension->info_mask & ACTION_OUI_INFO_AP_CAPABILITY_BAND && + ((attr->enable_5g && + !(*extension->capability & ACTION_CAPABILITY_5G_BAND_MASK)) || + (attr->enable_2g && + !(*extension->capability & ACTION_OUI_CAPABILITY_2G_BAND_MASK)))) + return false; return true; } diff --git a/core/hdd/inc/hdd_config.h b/core/hdd/inc/hdd_config.h index e501eb6fd9..e93405ca9f 100644 --- a/core/hdd/inc/hdd_config.h +++ b/core/hdd/inc/hdd_config.h @@ -904,7 +904,7 @@ struct dhcp_server { /* * * gActionOUIConnect1x1 - Used to specify action OUIs for 1x1 connection - * @Default: 000C43 00 25 42 001018 06 02FFF02C0000 BC 25 42 001018 06 02FF040C0000 BC 25 42 00037F 00 35 6C + * @Default: 000C43 00 25 C2 001018 06 02FFF02C0000 BC 25 42 001018 06 02FF040C0000 BC 25 42 00037F 00 35 6C 001018 06 02FF009C0000 BC 25 48 * Note: User should strictly add new action OUIs at the end of this * default value. * @@ -912,7 +912,7 @@ struct dhcp_server { * OUI 1 : 000C43 * OUI data Len : 00 * Info Mask : 25 - Check for NSS and Band - * Capabilities: 42 - NSS == 2 && Band == 2G + * Capabilities: C2 - NSS == 2 && Band == 2G || Band == 5G * OUI 2 : 001018 * OUI data Len : 06 * OUI Data : 02FFF02C0000 @@ -951,7 +951,7 @@ struct dhcp_server { "gActionOUIConnect1x1", \ 0, \ ACTION_OUI_MAX_STR_LEN, \ - "000C43 00 25 42 001018 06 02FFF02C0000 BC 25 42 001018 06 02FF040C0000 BC 25 42 00037F 00 35 6C 001018 06 02FF009C0000 BC 25 48", \ + "000C43 00 25 C2 001018 06 02FFF02C0000 BC 25 42 001018 06 02FF040C0000 BC 25 42 00037F 00 35 6C 001018 06 02FF009C0000 BC 25 48", \ "Used to specify action OUIs for 1x1 connection") /*