From 152d22d4f9b1bee2094f3b9d2d625e10931f1a1e Mon Sep 17 00:00:00 2001
From: goldsimon <goldsimon>
Date: Sat, 2 May 2009 16:12:35 +0000
Subject: [PATCH] fixed tcpip_untimeout (does not need the time, broken after
 1.3.0 in CVS only) - fixes compilation of ppp_oe.c

---
 CHANGELOG                | 4 ++++
 src/api/tcpip.c          | 3 +--
 src/include/lwip/tcpip.h | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 0111fee1..333ed20c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -95,6 +95,10 @@ HISTORY
 
   ++ Bugfixes:
 
+  2009-05-02 Simon Goldschmidt
+  * tcpip.h, tcpip.c: fixed tcpip_untimeout (does not need the time, broken after
+    1.3.0 in CVS only) - fixes compilation of ppp_oe.c
+
   2009-05-02 Simon Goldschmidt
   * msg_in.c: fixed bug #25636: SNMPSET value is ignored for integer fields
 
diff --git a/src/api/tcpip.c b/src/api/tcpip.c
index 5fa4b958..002df90b 100644
--- a/src/api/tcpip.c
+++ b/src/api/tcpip.c
@@ -418,7 +418,7 @@ tcpip_timeout(u32_t msecs, sys_timeout_handler h, void *arg)
  * @return ERR_MEM on memory error, ERR_OK otherwise
  */
 err_t
-tcpip_untimeout(u32_t msecs, sys_timeout_handler h, void *arg)
+tcpip_untimeout(sys_timeout_handler h, void *arg)
 {
   struct tcpip_msg *msg;
 
@@ -429,7 +429,6 @@ tcpip_untimeout(u32_t msecs, sys_timeout_handler h, void *arg)
     }
 
     msg->type = TCPIP_MSG_UNTIMEOUT;
-    msg->msg.tmo.msecs = msecs;
     msg->msg.tmo.h = h;
     msg->msg.tmo.arg = arg;
     sys_mbox_post(mbox, msg);
diff --git a/src/include/lwip/tcpip.h b/src/include/lwip/tcpip.h
index 4f5b7f8f..110a06b9 100644
--- a/src/include/lwip/tcpip.h
+++ b/src/include/lwip/tcpip.h
@@ -90,7 +90,7 @@ err_t pbuf_free_callback(struct pbuf *p);
 err_t mem_free_callback(void *m);
 
 err_t tcpip_timeout(u32_t msecs, sys_timeout_handler h, void *arg);
-err_t tcpip_untimeout(u32_t msecs, sys_timeout_handler h, void *arg);
+err_t tcpip_untimeout(sys_timeout_handler h, void *arg);
 
 enum tcpip_msg_type {
 #if LWIP_NETCONN