summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.bin/kdump/Makefile7
-rw-r--r--usr.bin/kdump/mkioctls9
2 files changed, 11 insertions, 5 deletions
diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile
index 759996c668e..d340ae1d78f 100644
--- a/usr.bin/kdump/Makefile
+++ b/usr.bin/kdump/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2004/11/24 18:11:15 fgsch Exp $
+# $OpenBSD: Makefile,v 1.12 2004/12/12 17:06:51 naddy Exp $
LDSTATIC=${STATIC}
PROG= kdump
@@ -20,10 +20,13 @@ ioctl.c: ${.CURDIR}/mkioctls
${DESTDIR}/usr/include/dev/vndioctl.h \
${DESTDIR}/usr/include/scsi/ses.h \
${DESTDIR}/usr/include/net/bpf.h \
- ${DESTDIR}/usr/include/net80211/ieee80211.h \
+ ${DESTDIR}/usr/include/net/if_pfsync.h \
${DESTDIR}/usr/include/net/if_ppp.h \
+ ${DESTDIR}/usr/include/net/if_pppoe.h \
${DESTDIR}/usr/include/net/if_tun.h \
${DESTDIR}/usr/include/net/pfvar.h \
+ ${DESTDIR}/usr/include/net80211/ieee80211_ioctl.h \
+ ${DESTDIR}/usr/include/netinet/ip_carp.h \
${DESTDIR}/usr/include/netinet6/in6_var.h \
${DESTDIR}/usr/include/sys/agpio.h \
${DESTDIR}/usr/include/sys/ataio.h \
diff --git a/usr.bin/kdump/mkioctls b/usr.bin/kdump/mkioctls
index ab84c06abe0..c74f8f24327 100644
--- a/usr.bin/kdump/mkioctls
+++ b/usr.bin/kdump/mkioctls
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $OpenBSD: mkioctls,v 1.17 2004/11/24 18:11:15 fgsch Exp $
+# $OpenBSD: mkioctls,v 1.18 2004/12/12 17:06:51 naddy Exp $
#
# Copyright (c) 1994
@@ -46,13 +46,16 @@ BEGIN {
print "#include <netinet6/nd6.h>"
print "#include <netinet6/ip6_mroute.h>"
print "#include <net/if_bridge.h>"
+ print "#include <net/if_pfsync.h>"
print "#include <sys/termios.h>"
+ print "#include <netinet/ip_carp.h>"
print "#include <netinet/ip_ipsp.h>"
print "#include <net/if_enc.h>"
print "#include <net80211/ieee80211.h>"
+ print "#include <net80211/ieee80211_ioctl.h>"
print "#include <net/ppp_defs.h>"
print "#include <net/if_ppp.h>"
- print "#include <net/if_pppvar.h>"
+ print "#include <net/if_pppoe.h>"
print "#include <net/if_tun.h>"
print "#include <net/pfvar.h>"
print "#include <sys/disklabel.h>"
@@ -92,7 +95,7 @@ BEGIN {
print ""
}
-/^#[ ]*define[ ]*(AGPIOC_|ATAIO|AUDIO_|BIOC|CCDIOC|CDIO|CIOC|CHIO|DIOC|MIDI_|GPIO|SEQUENCER_|TIO|FIO|FIBMAP|MTIOC|SIO|OSIO|SESIOC_|SIOC|PCIOC|PPPIOC|RD_|RIOC|RND|STRIOC|SCIOC|OSCIOC|TUN|VNDIOC|WSKBD|WSMOUSE|WSDISPLAY|WSMUX)[A-Z_0-9]*[ ]*_IO/ {
+/^#[ ]*define[ ]*(AGPIOC_|ATAIO|AUDIO_|BIOC|CCDIOC|CDIO|CIOC|CHIO|DIOC|MIDI_|GPIO|SEQUENCER_|TIO|FIO|FIBMAP|MTIOC|SIO|OSIO|SESIOC_|SIOC|PCIOC|PPPIOC|PPPOE|RD_|RIOC|RND|STRIOC|SCIOC|OSCIOC|TUN|VNDIOC|WSKBD|WSMOUSE|WSDISPLAY|WSMUX)[A-Z_0-9]*[ ]*_IO/ {
# find where the name starts
for (i = 1; i <= NF; i++)