summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/net/bpf.h3
-rw-r--r--sys/net/if_pflog.h13
2 files changed, 2 insertions, 14 deletions
diff --git a/sys/net/bpf.h b/sys/net/bpf.h
index 9df18d9bdcb..e6fd3478dfb 100644
--- a/sys/net/bpf.h
+++ b/sys/net/bpf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bpf.h,v 1.38 2008/12/22 12:13:13 michele Exp $ */
+/* $OpenBSD: bpf.h,v 1.39 2010/06/26 16:49:01 henning Exp $ */
/* $NetBSD: bpf.h,v 1.15 1996/12/13 07:57:33 mikel Exp $ */
/*
@@ -179,7 +179,6 @@ struct bpf_hdr {
#define DLT_RAW 14 /* raw IP */
#define DLT_SLIP_BSDOS 15 /* BSD/OS Serial Line IP */
#define DLT_PPP_BSDOS 16 /* BSD/OS Point-to-point Protocol */
-#define DLT_OLD_PFLOG 17 /* Packet filter logging, old (XXX remove?) */
#define DLT_PFSYNC 18 /* Packet filter state syncing */
#define DLT_PPP_ETHER 51 /* PPP over Ethernet; session only w/o ether header */
#define DLT_IEEE802_11 105 /* IEEE 802.11 wireless */
diff --git a/sys/net/if_pflog.h b/sys/net/if_pflog.h
index e9e0b01e5e5..835700c5bb7 100644
--- a/sys/net/if_pflog.h
+++ b/sys/net/if_pflog.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_pflog.h,v 1.14 2006/10/25 11:27:01 henning Exp $ */
+/* $OpenBSD: if_pflog.h,v 1.15 2010/06/26 16:49:01 henning Exp $ */
/*
* Copyright 2001 Niels Provos <provos@citi.umich.edu>
* All rights reserved.
@@ -58,17 +58,6 @@ struct pfloghdr {
/* minus pad, also used as a signature */
#define PFLOG_REAL_HDRLEN offsetof(struct pfloghdr, pad)
-/* XXX remove later when old format logs are no longer needed */
-struct old_pfloghdr {
- u_int32_t af;
- char ifname[IFNAMSIZ];
- short rnr;
- u_short reason;
- u_short action;
- u_short dir;
-};
-#define OLD_PFLOG_HDRLEN sizeof(struct old_pfloghdr)
-
#ifdef _KERNEL
#if NPFLOG > 0