From b462cb4575eb47ab5dc8d4cbf5fdde1c859daaac Mon Sep 17 00:00:00 2001
From: goldsimon <goldsimon>
Date: Mon, 30 Apr 2007 11:45:39 +0000
Subject: [PATCH] Define ETH_PAD_SIZE after including opt.h to avoid conflict
 with lwipopts.h

---
 src/include/netif/etharp.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/include/netif/etharp.h b/src/include/netif/etharp.h
index a01cce17..ebb49178 100644
--- a/src/include/netif/etharp.h
+++ b/src/include/netif/etharp.h
@@ -35,15 +35,16 @@
 #ifndef __NETIF_ETHARP_H__
 #define __NETIF_ETHARP_H__
 
-#ifndef ETH_PAD_SIZE
-#define ETH_PAD_SIZE 0
-#endif
-
+#include "lwip/opt.h"
 #include "lwip/pbuf.h"
 #include "lwip/ip_addr.h"
 #include "lwip/netif.h"
 #include "lwip/ip.h"
 
+#ifndef ETH_PAD_SIZE
+#define ETH_PAD_SIZE 0
+#endif
+
 #ifdef PACK_STRUCT_USE_INCLUDES
 #  include "arch/bpstruct.h"
 #endif