Skip to content

Commit 7888591

Browse files
M-ichae-ladbridge
authored andcommitted
fix realtek_rtl8195am IPv6 build fails update
fix for #6909 -remove the "dhcps.h" and "dhcps.c" files -edit "wifi_conf.c" "wifi_conf.h" and "rtw_emac.cpp" to fix compile error rebase for #6974
1 parent 2f69d03 commit 7888591

File tree

4 files changed

+11
-921
lines changed

4 files changed

+11
-921
lines changed

targets/TARGET_Realtek/TARGET_AMEBA/rtw_emac.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static void wlan_get_ifname(emac_interface_t *emac, char *name, uint8_t size)
5151

5252
static uint8_t wlan_get_hwaddr_size(emac_interface_t *emac)
5353
{
54-
return ETHARP_HWADDR_LEN;
54+
return ETH_HWADDR_LEN;
5555
}
5656

5757
static void wlan_get_hwaddr(emac_interface_t *emac, uint8_t *addr)

targets/TARGET_Realtek/TARGET_AMEBA/sdk/common/api/wifi/wifi_conf.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* limitations under the License.
1414
*/
1515

16-
#include <dhcp/dhcps.h>
16+
//#include <dhcp/dhcps.h>
1717
//#include <flash/stm32_flash.h>
1818
#include <platform/platform_stdlib.h>
1919
#include <wifi/wifi_conf.h>
@@ -1001,7 +1001,9 @@ int wifi_off(void)
10011001
return 0;
10021002
}
10031003
#if CONFIG_LWIP_LAYER
1004-
dhcps_deinit();
1004+
#ifndef CONFIG_MBED_ENABLED
1005+
dhcps_deinit();
1006+
#endif
10051007
#if !DEVICE_EMAC
10061008
LwIP_DHCP(0, DHCP_STOP);
10071009
netif_set_down(&xnetif[0]);
@@ -1043,7 +1045,9 @@ int wifi_off(void)
10431045
int wifi_off_fastly(void)
10441046
{
10451047
#if CONFIG_LWIP_LAYER
1046-
dhcps_deinit();
1048+
#ifndef CONFIG_MBED_ENABLED
1049+
dhcps_deinit();
1050+
#endif
10471051
#if !DEVICE_EMAC
10481052
LwIP_DHCP(0, DHCP_STOP);
10491053
#endif
@@ -1688,7 +1692,9 @@ int wifi_restart_ap(
16881692
}
16891693

16901694
// stop dhcp server
1691-
dhcps_deinit();
1695+
#ifndef CONFIG_MBED_ENABLED
1696+
dhcps_deinit();
1697+
#endif
16921698

16931699
#ifdef CONFIG_CONCURRENT_MODE
16941700
if(idx > 0){

0 commit comments

Comments
 (0)