diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2009-06-19 11:10:02 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2009-06-19 11:10:02 -0700 |
| commit | 0182115b13c0c9dc9bf238106846b0499e894e22 (patch) | |
| tree | 56389a74172310b7090a4e8861565756d92e705d | |
| parent | 807176e5fd5bdd9713f2c768590c2f0f9057eb3a (diff) | |
| download | ti-0182115b13c0c9dc9bf238106846b0499e894e22.tar.gz | |
Add random default MAC address setting
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| -rw-r--r-- | wilink_6_1/TWD/FW_Transfer/HwInit.c | 16 | ||||
| -rw-r--r-- | wilink_6_1/stad/build/linux/common.inc | 2 | ||||
| -rw-r--r-- | wilink_6_1/stad/src/Sta_Management/siteMgr.c | 22 |
3 files changed, 27 insertions, 13 deletions
diff --git a/wilink_6_1/TWD/FW_Transfer/HwInit.c b/wilink_6_1/TWD/FW_Transfer/HwInit.c index 9df9aa4..c0fd11f 100644 --- a/wilink_6_1/TWD/FW_Transfer/HwInit.c +++ b/wilink_6_1/TWD/FW_Transfer/HwInit.c @@ -56,7 +56,10 @@ #include "eventMbox_api.h" #include "CmdBld.h" #include "CmdMBox_api.h" - +#ifdef TI_RANDOM_DEFAULT_MAC +#include <linux/random.h> +#include <linux/jiffies.h> +#endif /* remove the chipID check when WL6-PG1.0 becomes obsolete (temporary global variable!!) */ TI_BOOL bChipIs1273Pg10 = TI_TRUE; @@ -411,6 +414,9 @@ TI_STATUS hwInit_Init (TI_HANDLE hHwInit, { THwInit *pHwInit = (THwInit *)hHwInit; TTxnStruct* pTxn; +#ifdef TI_RANDOM_DEFAULT_MAC + u32 rand_mac; +#endif /* Configure modules handles */ pHwInit->hReport = hReport; @@ -422,6 +428,14 @@ TI_STATUS hwInit_Init (TI_HANDLE hHwInit, pHwInit->hFinalizeDownload = hFinalizeDownload; SET_DEF_NVS(pHwInit->aDefaultNVS) +#ifdef TI_RANDOM_DEFAULT_MAC + /* Create random MAC address: offset 3, 4 and 5 */ + srandom32((u32)jiffies); + rand_mac = random32(); + pHwInit->aDefaultNVS[3] = (u8)rand_mac; + pHwInit->aDefaultNVS[4] = (u8)(rand_mac >> 8); + pHwInit->aDefaultNVS[5] = (u8)(rand_mac >> 16); +#endif for (pHwInit->uTxnIndex=0;pHwInit->uTxnIndex<MAX_HW_INIT_CONSECUTIVE_TXN;pHwInit->uTxnIndex++) { diff --git a/wilink_6_1/stad/build/linux/common.inc b/wilink_6_1/stad/build/linux/common.inc index 1eb74fe..ada7c26 100644 --- a/wilink_6_1/stad/build/linux/common.inc +++ b/wilink_6_1/stad/build/linux/common.inc @@ -161,6 +161,6 @@ endif ## EXTRA_CFLAGS += -fsigned-char -EXTRA_CFLAGS += -D __LINUX__ +EXTRA_CFLAGS += -D __LINUX__ -DTI_RANDOM_DEFAULT_MAC EXTRA_CFLAGS += $(DK_DEFINES) EXTRA_CFLAGS += $(PFORM_DEFINES) diff --git a/wilink_6_1/stad/src/Sta_Management/siteMgr.c b/wilink_6_1/stad/src/Sta_Management/siteMgr.c index 185dbe7..1bdbb13 100644 --- a/wilink_6_1/stad/src/Sta_Management/siteMgr.c +++ b/wilink_6_1/stad/src/Sta_Management/siteMgr.c @@ -2824,22 +2824,22 @@ RETURN: ************************************************************************/ void siteMgr_printPrimarySiteDesc(TI_HANDLE hSiteMgr ) { - siteMgr_t *pSiteMgr = (siteMgr_t*) hSiteMgr; + siteMgr_t *pSiteMgr = (siteMgr_t*) hSiteMgr; - siteEntry_t *pPrimarySite = pSiteMgr->pSitesMgmtParams->pPrimarySite; + siteEntry_t *pPrimarySite = pSiteMgr->pSitesMgmtParams->pPrimarySite; - /* the driver logger can't print %s - * TRACE1(pSiteMgr->hReport, REPORT_SEVERITY_CONSOLE, "-- SSID = %s \n",pPrimarySite->ssid.str); - */ - TRACE6(pSiteMgr->hReport, REPORT_SEVERITY_CONSOLE,"-- BSSID = %x-%x-%x-%x-%x-%x\n", - pPrimarySite->bssid[0], pPrimarySite->bssid[1], pPrimarySite->bssid[2], pPrimarySite->bssid[3], - pPrimarySite->bssid[4], pPrimarySite->bssid[5]); + /* the driver logger can't print %s + * TRACE1(pSiteMgr->hReport, REPORT_SEVERITY_CONSOLE, "-- SSID = %s \n",pPrimarySite->ssid.str); + */ + TRACE6(pSiteMgr->hReport, REPORT_SEVERITY_CONSOLE,"-- BSSID = %02x-%02x-%02x-%02x-%02x-%02x\n", + pPrimarySite->bssid[0], pPrimarySite->bssid[1], pPrimarySite->bssid[2], pPrimarySite->bssid[3], + pPrimarySite->bssid[4], pPrimarySite->bssid[5]); WLAN_OS_REPORT(("-- SSID = %s \n",pPrimarySite->ssid.str)); - WLAN_OS_REPORT(("-- BSSID = %x-%x-%x-%x-%x-%x\n", - pPrimarySite->bssid[0], pPrimarySite->bssid[1], pPrimarySite->bssid[2], pPrimarySite->bssid[3], - pPrimarySite->bssid[4], pPrimarySite->bssid[5])); + WLAN_OS_REPORT(("-- BSSID = %02x-%02x-%02x-%02x-%02x-%02x\n", + pPrimarySite->bssid[0], pPrimarySite->bssid[1], pPrimarySite->bssid[2], pPrimarySite->bssid[3], + pPrimarySite->bssid[4], pPrimarySite->bssid[5])); } #endif |