From aae31dbf3205a16e99cdd85918abc0a16b13a7c4 Mon Sep 17 00:00:00 2001 From: brian Date: Thu, 8 Jul 2004 22:35:36 +0000 Subject: Change the following environment variables to kernel options: bootp -> BOOTP bootp.nfsroot -> BOOTP_NFSROOT bootp.nfsv3 -> BOOTP_NFSV3 bootp.compat -> BOOTP_COMPAT bootp.wired_to -> BOOTP_WIRED_TO - i.e. back out the previous commit. It's already possible to pxeboot(8) with a GENERIC kernel. Pointed out by: dwmalone --- sys/netinet/ip_input.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'sys/netinet') diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 77c8c79..048f613 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -30,6 +30,7 @@ * $FreeBSD$ */ +#include "opt_bootp.h" #include "opt_ipfw.h" #include "opt_ipdn.h" #include "opt_ipdivert.h" @@ -298,7 +299,6 @@ ip_input(struct mbuf *m) struct ipq *fp; struct in_ifaddr *ia = NULL; struct ifaddr *ifa; - char *cp; int i, checkif, hlen = 0; u_short sum; struct in_addr pkt_dst; @@ -598,11 +598,10 @@ pass: goto ours; if (ia->ia_netbroadcast.s_addr == pkt_dst.s_addr) goto ours; - if ((cp = getenv("bootp.compat")) != NULL) { - freeenv(cp); - if (IA_SIN(ia)->sin_addr.s_addr == INADDR_ANY) - goto ours; - } +#ifdef BOOTP_COMPAT + if (IA_SIN(ia)->sin_addr.s_addr == INADDR_ANY) + goto ours; +#endif } } if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr))) { -- cgit v1.1