From 26e88dc2c16a1976d16b4aeffebff40e79806069 Mon Sep 17 00:00:00 2001
From: fbernon <fbernon>
Date: Tue, 3 Apr 2007 14:08:11 +0000
Subject: [PATCH] Don't set the IP_DF ("Don't fragment") flag in the IP header
 in IP output packets. See patch #5834.

---
 CHANGELOG          | 6 +++---
 src/core/ipv4/ip.c | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index da486008..190d97ab 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -98,9 +98,9 @@ HISTORY
 
   ++ Bug fixes:
 
-  2007-03-30 Frédéric Bernon
-  * ip.c: if IP_REASSEMBLY is set to 1, don't set the IP_DF ("Don't fragment") flag
-    in the IP header in IP output packets.
+  2007-04-03 Frédéric Bernon
+  * ip.c: Don't set the IP_DF ("Don't fragment") flag in the IP header in IP output
+    packets. See patch #5834.
 
   2007-03-30 Frédéric Bernon
   * api_msg.c: add a "pcb_new" helper function to avoid redundant code, and to add
diff --git a/src/core/ipv4/ip.c b/src/core/ipv4/ip.c
index a8a660da..d07361fb 100644
--- a/src/core/ipv4/ip.c
+++ b/src/core/ipv4/ip.c
@@ -438,11 +438,7 @@ ip_output_if(struct pbuf *p, struct ip_addr *src, struct ip_addr *dest,
 
     IPH_VHLTOS_SET(iphdr, 4, IP_HLEN / 4, tos);
     IPH_LEN_SET(iphdr, htons(p->tot_len));
-#if IP_REASSEMBLY
     IPH_OFFSET_SET(iphdr, 0);
-#else
-    IPH_OFFSET_SET(iphdr, htons(IP_DF));
-#endif /* IP_REASSEMBLY */
     IPH_ID_SET(iphdr, htons(ip_id));
     ++ip_id;