Merged from DEVEL.

doc/savannah.txt

@@ -4,7 +4,8 @@ Table of Contents:
 
 1 - Anonymous CVS checkouts and updates (to be elaborated)
 2 - Committers/developers CVS access using SSH (to be written)
-3 - How to release lwIP
+3 - Merging from DEVEL branch to main trunk (stable branch)
+4 - How to release lwIP
 
 
 1 Anonymous CVS checkouts and updates
@@ -25,7 +26,29 @@ Or, obtain a development branch as follows:
 cvs -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/lwip login
 cvs -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/lwip checkout -r DEVEL -d lwip-devel lwip
 
-3 How to release lwIP
+
+3 Merging from DEVEL branch to main trunk (stable branch)
+---------------------------------------------------------
+
+Merging from DEVEL to main requires that the DEVEL branch
+has a tag indicating the previous merger. This tag is
+called 'merged_from_DEVEL_to_main'.
+
+IMPORTANT: AFTER COMMITTING A SUCCESFUL MERGE IN THE
+REPOSITORY, THE TAG MUST BE SET ON THE SOURCE OF THE
+MERGE BRANCH (REPLACING EXISTING TAGS WITH THE SAME NAME).
+
+Merge all changes in DEVEL since our last merge to main:
+
+In the working copy of the main trunk:
+cvs update -P -jmerged_from_DEVEL_to_main -jDEVEL 
+
+Now move the tag in the DEVEL branch to this merge point,
+so we can use this for future merges.
+
+cvs -z4 rtag -F -r DEVEL merged_from_DEVEL_to_main lwip 
+
+4 How to release lwIP
 ---------------------
 
 First, checkout a clean copy of the branch to be released. Tag this set with

src/core/pbuf.c

@@ -853,7 +853,6 @@ pbuf_take(struct pbuf *p)
   return head;
 }
 
-#if 0 /* TODO: See if we might need this for future features */
 /**
  * Dechains the first pbuf from its succeeding pbufs in the chain.
  *
@@ -890,7 +889,6 @@ pbuf_dechain(struct pbuf *p)
   LWIP_ASSERT("p->tot_len == p->len", p->tot_len == p->len);
   return (tail_gone > 0? NULL: q);
 }
-#endif /* pbuf_dechain() */
 
 /* TODO: This function is unused in the lwIP stack and will be deprecated. This is due
  * to the new way chains are built. */

src/include/lwip/pbuf.h

@@ -110,8 +110,6 @@ u8_t pbuf_free(struct pbuf *p);
 u8_t pbuf_clen(struct pbuf *p);  
 void pbuf_chain(struct pbuf *h, struct pbuf *t);
 struct pbuf *pbuf_take(struct pbuf *f);
-#if 0 /* see remark in code */
 struct pbuf *pbuf_dechain(struct pbuf *p);
-#endif
 
 #endif /* __LWIP_PBUF_H__ */