[syslinux:lwip] pxe: remove non-lwIP definition of DNS_MAX_SERVERS
syslinux-bot for H. Peter Anvin
hpa at zytor.com
Mon Apr 25 17:33:03 PDT 2011
Commit-ID: 6e57f2115b84c073ccc94de55cf0e7367335c422
Gitweb: http://syslinux.zytor.com/commit/6e57f2115b84c073ccc94de55cf0e7367335c422
Author: H. Peter Anvin <hpa at zytor.com>
AuthorDate: Mon, 25 Apr 2011 17:30:59 -0700
Committer: H. Peter Anvin <hpa at zytor.com>
CommitDate: Mon, 25 Apr 2011 17:30:59 -0700
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 at zytor.com>
---
core/fs/pxe/dhcp_option.c | 1 +
core/fs/pxe/pxe.c | 1 +
core/fs/pxe/pxe.h | 4 ----
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/core/fs/pxe/dhcp_option.c b/core/fs/pxe/dhcp_option.c
index 47031fa..68f1ebe 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 858f573..7ac3519 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 8228def..94bc58d 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
*/
More information about the Syslinux-commits
mailing list