wlan: Get Mac addr from platform driver
Read the MAC address from the platform driver preferrably and
fall back to the option of auto generating the same, if the
MAC read is invalid.
Change-Id: I3f5dc5f7b3f4788c237995a34c06c7908e489c5c
CRs-Fixed: 583465
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 95fb6ec..1f0c694 100755
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -7544,6 +7544,66 @@
}
}
+/**---------------------------------------------------------------------------
+
+ \brief hdd_generate_iface_mac_addr_auto() - HDD Mac Interface Auto
+ generate function
+
+ This is generate the random mac address for WLAN interface
+
+ \param - pHddCtx - Pointer to HDD context
+ idx - Start interface index to get auto
+ generated mac addr.
+ mac_addr - Mac address
+
+ \return - 0 for success, < 0 for failure
+
+ --------------------------------------------------------------------------*/
+
+static int hdd_generate_iface_mac_addr_auto(hdd_context_t *pHddCtx,
+ int idx, v_MACADDR_t mac_addr)
+{
+ int i;
+ unsigned int serialno;
+ serialno = wcnss_get_serial_number();
+
+ if (0 != serialno)
+ {
+ /* MAC address has 3 bytes of OUI so we have a maximum of 3
+ bytes of the serial number that can be used to generate
+ the other 3 bytes of the MAC address. Mask off all but
+ the lower 3 bytes (this will also make sure we don't
+ overflow in the next step) */
+ serialno &= 0x00FFFFFF;
+
+ /* we need a unique address for each session */
+ serialno *= VOS_MAX_CONCURRENCY_PERSONA;
+
+ /* autogen other Mac addresses */
+ for (i = idx; i < VOS_MAX_CONCURRENCY_PERSONA; i++)
+ {
+ /* start with the entire default address */
+ pHddCtx->cfg_ini->intfMacAddr[i] = mac_addr;
+ /* then replace the lower 3 bytes */
+ pHddCtx->cfg_ini->intfMacAddr[i].bytes[3] = (serialno >> 16) & 0xFF;
+ pHddCtx->cfg_ini->intfMacAddr[i].bytes[4] = (serialno >> 8) & 0xFF;
+ pHddCtx->cfg_ini->intfMacAddr[i].bytes[5] = serialno & 0xFF;
+
+ serialno++;
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ "%s: Derived Mac Addr: "
+ MAC_ADDRESS_STR, __func__,
+ MAC_ADDR_ARRAY(pHddCtx->cfg_ini->intfMacAddr[i].bytes));
+ }
+
+ }
+ else
+ {
+ hddLog(LOGE, FL("Failed to Get Serial NO"));
+ return -1;
+ }
+ return 0;
+}
/**---------------------------------------------------------------------------
@@ -7571,6 +7631,7 @@
#endif
int ret;
struct wiphy *wiphy;
+ v_MACADDR_t mac_addr;
ENTER();
/*
@@ -7873,10 +7934,34 @@
goto err_vosclose;
}
- // Apply the NV to cfg.dat
- /* Prima Update MAC address only at here */
- if (VOS_STATUS_SUCCESS != hdd_update_config_from_nv(pHddCtx))
+ // Get mac addr from platform driver
+ ret = wcnss_get_wlan_mac_address((char*)&mac_addr.bytes);
+
+ if ((0 == ret) && (!vos_is_macaddr_zero(&mac_addr)))
{
+ /* Store the mac addr for first interface */
+ pHddCtx->cfg_ini->intfMacAddr[0] = mac_addr;
+
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ "%s: WLAN Mac Addr: "
+ MAC_ADDRESS_STR, __func__,
+ MAC_ADDR_ARRAY(pHddCtx->cfg_ini->intfMacAddr[0].bytes));
+
+ /* Here, passing Arg2 as 1 because we do not want to change the
+ last 3 bytes (means non OUI bytes) of first interface mac
+ addr.
+ */
+ if (0 != hdd_generate_iface_mac_addr_auto(pHddCtx, 1, mac_addr))
+ {
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ "%s: Failed to generate wlan interface mac addr "
+ "using MAC from ini file ", __func__);
+ }
+ }
+ else if (VOS_STATUS_SUCCESS != hdd_update_config_from_nv(pHddCtx))
+ {
+ // Apply the NV to cfg.dat
+ /* Prima Update MAC address only at here */
#ifdef WLAN_AUTOGEN_MACADDR_FEATURE
/* There was not a valid set of MAC Addresses in NV. See if the
default addresses were modified by the cfg.ini settings. If so,
@@ -7885,42 +7970,24 @@
static const v_MACADDR_t default_address =
{{0x00, 0x0A, 0xF5, 0x89, 0x89, 0xFF}};
- unsigned int serialno;
- int i;
- serialno = wcnss_get_serial_number();
- if ((0 != serialno) &&
- (0 == memcmp(&default_address, &pHddCtx->cfg_ini->intfMacAddr[0],
- sizeof(default_address))))
+ if (0 == memcmp(&default_address, &pHddCtx->cfg_ini->intfMacAddr[0],
+ sizeof(default_address)))
{
/* cfg.ini has the default address, invoke autogen logic */
- /* MAC address has 3 bytes of OUI so we have a maximum of 3
- bytes of the serial number that can be used to generate
- the other 3 bytes of the MAC address. Mask off all but
- the lower 3 bytes (this will also make sure we don't
- overflow in the next step) */
- serialno &= 0x00FFFFFF;
-
- /* we need a unique address for each session */
- serialno *= VOS_MAX_CONCURRENCY_PERSONA;
-
- /* autogen all addresses */
- for (i = 0; i < VOS_MAX_CONCURRENCY_PERSONA; i++)
+ /* Here, passing Arg2 as 0 because we want to change the
+ last 3 bytes (means non OUI bytes) of all the interfaces
+ mac addr.
+ */
+ if (0 != hdd_generate_iface_mac_addr_auto(pHddCtx, 0,
+ default_address))
{
- /* start with the entire default address */
- pHddCtx->cfg_ini->intfMacAddr[i] = default_address;
- /* then replace the lower 3 bytes */
- pHddCtx->cfg_ini->intfMacAddr[i].bytes[3] = (serialno >> 16) & 0xFF;
- pHddCtx->cfg_ini->intfMacAddr[i].bytes[4] = (serialno >> 8) & 0xFF;
- pHddCtx->cfg_ini->intfMacAddr[i].bytes[5] = serialno & 0xFF;
-
- serialno++;
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ "%s: Failed to generate wlan interface mac addr "
+ "using MAC from ini file " MAC_ADDRESS_STR, __func__,
+ MAC_ADDR_ARRAY(pHddCtx->cfg_ini->intfMacAddr[0].bytes));
}
-
- pr_info("wlan: Invalid MAC addresses in NV, autogenerated "
- MAC_ADDRESS_STR,
- MAC_ADDR_ARRAY(pHddCtx->cfg_ini->intfMacAddr[0].bytes));
}
else
#endif //WLAN_AUTOGEN_MACADDR_FEATURE
@@ -7933,12 +8000,15 @@
}
{
eHalStatus halStatus;
- // Set the MAC Address
- // Currently this is used by HAL to add self sta. Remove this once self sta is added as part of session open.
+
+ /* Set the MAC Address Currently this is used by HAL to
+ * add self sta. Remove this once self sta is added as
+ * part of session open.
+ */
halStatus = cfgSetStr( pHddCtx->hHal, WNI_CFG_STA_ID,
(v_U8_t *)&pHddCtx->cfg_ini->intfMacAddr[0],
sizeof( pHddCtx->cfg_ini->intfMacAddr[0]) );
-
+
if (!HAL_STATUS_SUCCESS( halStatus ))
{
hddLog(VOS_TRACE_LEVEL_ERROR,"%s: Failed to set MAC Address. "