diff --git a/lwip/src/include/lwipopts.h b/lwip/src/include/lwipopts.h
index 3b251daf..ae3f9d71 100644
--- a/lwip/src/include/lwipopts.h
+++ b/lwip/src/include/lwipopts.h
@@ -104,7 +104,7 @@
 /**
  * TCP_SND_BUF: TCP sender buffer space (bytes). 
  */
-#define TCP_SND_BUF		(16 * TCP_WND)
+#define TCP_SND_BUF		(16 * TCP_MSS)
 
 /**
  * LWIP_BROADCAST_PING==1: respond to broadcast pings (default is unicast only)
@@ -139,13 +139,6 @@
  */
 #define LWIP_CHECKSUM_ON_COPY	1
 
-/**
- * IP_FORWARD==1: Enables the ability to forward IP packets across network
- * interfaces. If you are going to run lwIP on a device with only one network
- * interface, define this to 0.
- */
-#define IP_FORWARD		1
-
 /**
  * TCPIP_THREAD_PRIO: The priority assigned to the main tcpip thread.
  * The priority value itself is platform-dependent, but is passed to
@@ -216,8 +209,7 @@
  */
 #define MEMP_NUM_NETCONN		32
 
-// On the SCC, we have not to check incoming messages from the trusted MCPC
-#ifdef CONFIG_ROCKCREEK
+#if 0
 /**
  * CHECKSUM_CHECK_IP==1: Check checksums in software for incoming IP packets.
  */