aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2011-04-25 17:30:59 -0700
committerH. Peter Anvin <hpa@zytor.com>2011-04-25 17:30:59 -0700
commit6e57f2115b84c073ccc94de55cf0e7367335c422 (patch)
tree51d15c0f049a961179e69cef15b21affb5b84a84
parent6bb618c959ffc6d462ce597f4e1f0e6c4baa7fa3 (diff)
downloadsyslinux-6e57f2115b84c073ccc94de55cf0e7367335c422.tar.gz
syslinux-6e57f2115b84c073ccc94de55cf0e7367335c422.tar.xz
syslinux-6e57f2115b84c073ccc94de55cf0e7367335c422.zip
pxe: remove non-lwIP definition of DNS_MAX_SERVERS
There is only need for one definition of DNS_MAX_SERVERS, and it needs to be the one in lwIP, so use it everywhere. Furthermore, there is no longer any need for us to define DNS_MAX_PACKET. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r--core/fs/pxe/dhcp_option.c1
-rw-r--r--core/fs/pxe/pxe.c1
-rw-r--r--core/fs/pxe/pxe.h4
3 files changed, 2 insertions, 4 deletions
diff --git a/core/fs/pxe/dhcp_option.c b/core/fs/pxe/dhcp_option.c
index 47031faf..68f1ebe0 100644
--- a/core/fs/pxe/dhcp_option.c
+++ b/core/fs/pxe/dhcp_option.c
@@ -2,6 +2,7 @@
#include <string.h>
#include <core.h>
#include <sys/cpu.h>
+#include <lwip/opt.h> /* DNS_MAX_SERVERS */
#include "pxe.h"
char LocalDomain[256];
diff --git a/core/fs/pxe/pxe.c b/core/fs/pxe/pxe.c
index 858f573b..7ac3519b 100644
--- a/core/fs/pxe/pxe.c
+++ b/core/fs/pxe/pxe.c
@@ -8,6 +8,7 @@
#include <lwip/api.h>
#include <lwip/dns.h>
#include <lwip/tcpip.h>
+#include <lwip/opt.h>
#include "pxe.h"
#include "thread.h"
#include "url.h"
diff --git a/core/fs/pxe/pxe.h b/core/fs/pxe/pxe.h
index 8228defb..94bc58d7 100644
--- a/core/fs/pxe/pxe.h
+++ b/core/fs/pxe/pxe.h
@@ -33,10 +33,6 @@
#define BOOTP_OPTION_MAGIC htonl(0x63825363)
#define MAC_MAX 32
-/* Defines for DNS */
-#define DNS_MAX_PACKET 512 /* Defined by protocol */
-#define DNS_MAX_SERVERS 4 /* Max no of DNS servers */
-
/*
* structures
*/