From b833a5ca80de2aef127bf33ed3a9efe635e69ff9 Mon Sep 17 00:00:00 2001 From: hduffddybz Date: Wed, 6 Aug 2014 00:19:13 -0800 Subject: [PATCH 1/2] correct spelling error --- components/net/lwip-1.4.1/src/netif/ethernetif.c | 4 ++++ examples/network/tcpclient.c | 2 +- examples/network/tcpserver.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/components/net/lwip-1.4.1/src/netif/ethernetif.c b/components/net/lwip-1.4.1/src/netif/ethernetif.c index ab7743290a..c47bb8e191 100644 --- a/components/net/lwip-1.4.1/src/netif/ethernetif.c +++ b/components/net/lwip-1.4.1/src/netif/ethernetif.c @@ -428,6 +428,10 @@ INIT_DEVICE_EXPORT(eth_system_device_init); #include void set_if(char* netif_name, char* ip_addr, char* gw_addr, char* nm_addr) { +#if LWIP_DHCP + return ; +#endif + struct ip_addr *ip; struct ip_addr addr; struct netif * netif = netif_list; diff --git a/examples/network/tcpclient.c b/examples/network/tcpclient.c index 088206fdb1..7a0d4b5365 100644 --- a/examples/network/tcpclient.c +++ b/examples/network/tcpclient.c @@ -81,7 +81,7 @@ void tcpclient(const char* url, int port) else { /* 在控制终端显示收到的数据 */ - rt_kprintf("\nRecieved data = %s " , recv_data); + rt_kprintf("\nReceived data = %s " , recv_data); } /* 发送数据到sock连接 */ diff --git a/examples/network/tcpserver.c b/examples/network/tcpserver.c index 54b8c9301d..3f34bc2c29 100644 --- a/examples/network/tcpserver.c +++ b/examples/network/tcpserver.c @@ -101,7 +101,7 @@ void tcpserv(void* parameter) else { /* 在控制终端显示收到的数据 */ - rt_kprintf("RECIEVED DATA = %s \n" , recv_data); + rt_kprintf("RECEIVED DATA = %s \n" , recv_data); } } } From f14d93b1b5dc26c7afd7c54d9d7867b95821dfee Mon Sep 17 00:00:00 2001 From: hduffddybz Date: Wed, 6 Aug 2014 00:28:44 -0800 Subject: [PATCH 2/2] correct spelling error --- components/net/lwip-1.4.1/src/netif/ethernetif.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/components/net/lwip-1.4.1/src/netif/ethernetif.c b/components/net/lwip-1.4.1/src/netif/ethernetif.c index c47bb8e191..ab7743290a 100644 --- a/components/net/lwip-1.4.1/src/netif/ethernetif.c +++ b/components/net/lwip-1.4.1/src/netif/ethernetif.c @@ -428,10 +428,6 @@ INIT_DEVICE_EXPORT(eth_system_device_init); #include void set_if(char* netif_name, char* ip_addr, char* gw_addr, char* nm_addr) { -#if LWIP_DHCP - return ; -#endif - struct ip_addr *ip; struct ip_addr addr; struct netif * netif = netif_list;