diff options
| author | brian <brian@FreeBSD.org> | 2004-07-08 22:35:36 +0000 |
|---|---|---|
| committer | brian <brian@FreeBSD.org> | 2004-07-08 22:35:36 +0000 |
| commit | aae31dbf3205a16e99cdd85918abc0a16b13a7c4 (patch) | |
| tree | 20232a5e4a3c9e6b2610bd5b43c7e935d7896f38 /sys/netinet | |
| parent | eeb3c914453162ca5f06e82aeddf24e35a8c86ad (diff) | |
| download | FreeBSD-src-aae31dbf3205a16e99cdd85918abc0a16b13a7c4.zip FreeBSD-src-aae31dbf3205a16e99cdd85918abc0a16b13a7c4.tar.gz | |
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
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/ip_input.c | 11 |
1 files changed, 5 insertions, 6 deletions
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))) { |
