aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-06-19 19:05:45 -0700
committerH. Peter Anvin <hpa@zytor.com>2010-06-19 19:05:45 -0700
commit9f1407746a1154a2dc456059e5f223bc689e8f4b (patch)
treec32b23a8792ab8ff8ca1fc3a39258473ee04aa01
parent7c890f5a328f6f0fc7e293247cbbcb18d369c447 (diff)
parent59ccd7ae8aa1fbecf7719297e118406187219bc6 (diff)
downloadsyslinux-9f1407746a1154a2dc456059e5f223bc689e8f4b.tar.gz
syslinux-9f1407746a1154a2dc456059e5f223bc689e8f4b.tar.xz
syslinux-9f1407746a1154a2dc456059e5f223bc689e8f4b.zip
Merge branch 'pathbased' of ssh://terminus.zytor.com/pub/git/syslinux/syslinux into pathbased
-rw-r--r--core/fs/pxe/dhcp_option.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/fs/pxe/dhcp_option.c b/core/fs/pxe/dhcp_option.c
index 39b51666..ee1a3785 100644
--- a/core/fs/pxe/dhcp_option.c
+++ b/core/fs/pxe/dhcp_option.c
@@ -244,6 +244,8 @@ void parse_dhcp(int pkt_len)
struct bootp_t *dhcp = (struct bootp_t *)trackbuf;
int opt_len;
+ IPInfo.ipv4 = 4; /* This is IPv4 only for now... */
+
over_load = 0;
if (ip_ok(dhcp->yip))
IPInfo.myip = dhcp->yip;