From 9e6ff21295b408fdd4fa24f417554db30c580710 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Fri, 2 Sep 2016 10:26:32 -0700 Subject: qcacld-3.0: Converge Intf*MacAddress default values There is a desire to remove unnecessary items from the default version of WCNSS_qcom_cfg.ini that is shipped to customers. Currently the default WCNSS_qcom_cfg.ini contains the following entries: Intf0MacAddress=000AF58989FF Intf1MacAddress=000AF58989FE Intf2MacAddress=000AF58989FD Intf3MacAddress=000AF58989FC The associated default values within the driver are: #define CFG_INTF0_MAC_ADDR_DEFAULT "000AF5898980" #define CFG_INTF1_MAC_ADDR_DEFAULT "000AF5898981" #define CFG_INTF2_MAC_ADDR_DEFAULT "000AF5898982" #define CFG_INTF3_MAC_ADDR_DEFAULT "000AF5898983" These are obviously divergent and should be converged. Elsewhere in the driver, in hdd_update_tgt_cfg(), is logic to auto-generate MAC addresses if no addresses have been configured. This logic currently checking: static struct qdf_mac_addr default_mac_addr = { {0x00, 0x0A, 0xF5, 0x89, 0x89, 0xFF} }; Since this logic is aligned with the values present in the default version of WCNSS_qcom_cfg.ini, update the CFG_INTF*_MAC_ADDR_DEFAULT definitions to match. Change-Id: Ic34bc67cffad44b4d61cdfeb06776d0e3a63889f CRs-Fixed: 1062967 --- core/hdd/inc/wlan_hdd_cfg.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index 50dc13fd33d7..d60052fbfdf3 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -283,22 +283,22 @@ typedef enum { #define CFG_INTF0_MAC_ADDR_NAME "Intf0MacAddress" #define CFG_INTF0_MAC_ADDR_MIN "000000000000" #define CFG_INTF0_MAC_ADDR_MAX "ffffffffffff" -#define CFG_INTF0_MAC_ADDR_DEFAULT "000AF5898980" +#define CFG_INTF0_MAC_ADDR_DEFAULT "000AF58989FF" #define CFG_INTF1_MAC_ADDR_NAME "Intf1MacAddress" #define CFG_INTF1_MAC_ADDR_MIN "000000000000" #define CFG_INTF1_MAC_ADDR_MAX "ffffffffffff" -#define CFG_INTF1_MAC_ADDR_DEFAULT "000AF5898981" +#define CFG_INTF1_MAC_ADDR_DEFAULT "000AF58989FE" #define CFG_INTF2_MAC_ADDR_NAME "Intf2MacAddress" #define CFG_INTF2_MAC_ADDR_MIN "000000000000" #define CFG_INTF2_MAC_ADDR_MAX "ffffffffffff" -#define CFG_INTF2_MAC_ADDR_DEFAULT "000AF5898982" +#define CFG_INTF2_MAC_ADDR_DEFAULT "000AF58989FD" #define CFG_INTF3_MAC_ADDR_NAME "Intf3MacAddress" #define CFG_INTF3_MAC_ADDR_MIN "000000000000" #define CFG_INTF3_MAC_ADDR_MAX "ffffffffffff" -#define CFG_INTF3_MAC_ADDR_DEFAULT "000AF5898983" +#define CFG_INTF3_MAC_ADDR_DEFAULT "000AF58989FC" #define CFG_AP_QOS_UAPSD_MODE_NAME "gEnableApUapsd" /* ACs to setup U-APSD for at assoc */ #define CFG_AP_QOS_UAPSD_MODE_MIN (0) -- cgit v1.2.3