From 5f9d0b7f7b7b59463a802588cab138315b8b0871 Mon Sep 17 00:00:00 2001 From: hwg Date: Wed, 15 Apr 2015 09:35:46 +0800 Subject: [PATCH] bcmdhd wifi driver: support custom mac address --- .../net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile | 2 +- .../rockchip_wlan/rkwifi/bcmdhd/dhd_linux_platdev.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile index a8e75aa0950f..ac6f7c2625ad 100755 --- a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile @@ -38,7 +38,7 @@ DHDOFILES += bcmsdh.o bcmsdh_linux.o bcmsdh_sdmmc.o bcmsdh_sdmmc_linux.o \ $(MODULE_NAME)-y += $(DHDOFILES) DHDOFILES += dhd_gpio.o -DHDCFLAGS += -DCUSTOMER_HW -DDHD_OF_SUPPORT +DHDCFLAGS += -DCUSTOMER_HW -DDHD_OF_SUPPORT -DGET_CUSTOM_MAC_ENABLE #DHDCFLAGS += -DBCMWAPI_WPI -DBCMWAPI_WAI ifeq ($(CONFIG_BCMDHD_OOB),y) diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_linux_platdev.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_linux_platdev.c index 6690e6e972a6..9641dabaf614 100755 --- a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_linux_platdev.c +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_linux_platdev.c @@ -206,11 +206,18 @@ int wifi_platform_bus_enumerate(wifi_adapter_info_t *adapter, bool device_presen } +#if defined(CUSTOMER_HW) +int rockchip_wifi_mac_addr(unsigned char *buf); +#endif int wifi_platform_get_mac_addr(wifi_adapter_info_t *adapter, unsigned char *buf) { - struct wifi_platform_data *plat_data; + //struct wifi_platform_data *plat_data; DHD_ERROR(("%s\n", __FUNCTION__)); + +#if defined(CUSTOMER_HW) + return rockchip_wifi_mac_addr(buf); +#else if (!buf || !adapter || !adapter->wifi_plat_data) return -EINVAL; plat_data = adapter->wifi_plat_data; @@ -218,6 +225,7 @@ int wifi_platform_get_mac_addr(wifi_adapter_info_t *adapter, unsigned char *buf) return plat_data->get_mac_addr(buf); } return -EOPNOTSUPP; +#endif } void *wifi_platform_get_country_code(wifi_adapter_info_t *adapter, char *ccode) -- 2.34.1