projects
/
openwrt-github
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[uboot-lantiq] httpd failsafe - add image check and flash access
[openwrt-github/.git]
/
package
/
uboot-lantiq
/
patches
/
300-httpd.patch
diff --git
a/package/uboot-lantiq/patches/300-httpd.patch
b/package/uboot-lantiq/patches/300-httpd.patch
index f9a81e90c67645b4ccc8beb211b107e0141e768f..25e84cde3e4d042d62b37a732635c5060ffb4708 100644
(file)
--- a/
package/uboot-lantiq/patches/300-httpd.patch
+++ b/
package/uboot-lantiq/patches/300-httpd.patch
@@
-165,7
+165,7
@@
NetRxPacket = inpkt;
NetRxPacketLen = len;
et = (Ethernet_t *)inpkt;
NetRxPacket = inpkt;
NetRxPacketLen = len;
et = (Ethernet_t *)inpkt;
-@@ -1952,3 +1972,16
1
@@ ushort getenv_VLAN(char *var)
+@@ -1952,3 +1972,16
2
@@ ushort getenv_VLAN(char *var)
{
return (string_to_VLAN(getenv(var)));
}
{
return (string_to_VLAN(getenv(var)));
}
@@
-249,6
+249,8
@@
+ NetArpWaitTxPacketSize = 0;
+ }
+
+ NetArpWaitTxPacketSize = 0;
+ }
+
++restart:
++
+ eth_halt();
+#ifdef CONFIG_NET_MULTI
+ eth_set_current();
+ eth_halt();
+#ifdef CONFIG_NET_MULTI
+ eth_set_current();
@@
-258,7
+260,6
@@
+ return(-1);
+ }
+
+ return(-1);
+ }
+
-+restart:
+#ifdef CONFIG_NET_MULTI
+ memcpy (NetOurEther, eth_get_dev()->enetaddr, 6);
+#else
+#ifdef CONFIG_NET_MULTI
+ memcpy (NetOurEther, eth_get_dev()->enetaddr, 6);
+#else