ramips: add support for the ARC FreeStation5 board, also fix WCR-150GN network setup...

[openwrt.git] / package / uboot-lantiq / patches / 200-httpd.patch

diff --git a/package/uboot-lantiq/patches/200-httpd.patch b/package/uboot-lantiq/patches/200-httpd.patch
index 04549fc..b0ab3b6 100644 (file)
--- a/package/uboot-lantiq/patches/200-httpd.patch
+++ b/package/uboot-lantiq/patches/200-httpd.patch
@@ -4609,7 +4609,7 @@
 +static void
 +uip_arp_update(u16_t *ipaddr, struct uip_eth_addr *ethaddr)
 +{
 +static void
 +uip_arp_update(u16_t *ipaddr, struct uip_eth_addr *ethaddr)
 +{

-+  register struct arp_entry *tabptr;
++  register struct arp_entry *tabptr = 0;

 +  /* Walk through the ARP mapping table and try to find an entry to
 +     update. If none is found, the IP -> MAC address mapping is
 +     inserted in the ARP table. */
 +  /* Walk through the ARP mapping table and try to find an entry to
 +     update. If none is found, the IP -> MAC address mapping is
 +     inserted in the ARP table. */


@@ -4801,7 +4801,7 @@
 +void
 +uip_arp_out(void)
 +{
 +void
 +uip_arp_out(void)
 +{

-+  struct arp_entry *tabptr;
++  struct arp_entry *tabptr = 0;

 +  /* Find the destination IP address in the ARP table and construct
 +     the Ethernet header. If the destination IP addres isn't on the
 +     local network, we use the default router's IP address instead.
 +  /* Find the destination IP address in the ARP table and construct
 +     the Ethernet header. If the destination IP addres isn't on the
 +     local network, we use the default router's IP address instead.


@@ -5647,13 +5647,11 @@
  
 --- a/common/main.c
 +++ b/common/main.c
  
 --- a/common/main.c
 +++ b/common/main.c

-@@ -273,6 +273,10 @@ static __inline__ int abortboot(int boot
+@@ -273,6 +273,8 @@ static __inline__ int abortboot(int boot

  
  void main_loop (void)
  {
  
  void main_loop (void)
  {

-+#ifdef CONFIG_CMD_HTTPD

 +      int ret;
 +      int ret;

-+#endif

 +
  #ifndef CONFIG_SYS_HUSH_PARSER
        static char lastcommand[CONFIG_SYS_CBSIZE] = { 0, };
 +
  #ifndef CONFIG_SYS_HUSH_PARSER
        static char lastcommand[CONFIG_SYS_CBSIZE] = { 0, };