make ffs_subr.c work with fsck(8) again

[unix-history] / usr / src / sys / net / bpfdesc.h

diff --git a/usr/src/sys/net/bpfdesc.h b/usr/src/sys/net/bpfdesc.h
index e36fbe9..f2af39d 100644 (file)
--- a/usr/src/sys/net/bpfdesc.h
+++ b/usr/src/sys/net/bpfdesc.h
@@ -1,27 +1,17 @@
 /*
 /*

- * Copyright (c) 1990 The Regents of the University of California.
+ * Copyright (c) 1990, 1991 Regents of the University of California.

  * All rights reserved.
  *
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * This code is derived from the Stanford/CMU enet packet filter,
+ * (net/enet.c) distributed as part of 4.3BSD, and code contributed
+ * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence
+ * Berkeley Laboratory.

  *
  *

- * @(#) $Header: bpfdesc.h,v 1.7 90/12/04 01:05:01 mccanne Exp $ (LBL)
+ * %sccs.include.redist.c%

  *
  *

- * This code is derived from the Stanford/CMU enet packet filter,
- * (net/enetdefs.h) distributed in 4.3BSD Unix.
+ *      @(#)bpfdesc.h  7.3 (Berkeley) %G%
+ *
+ * @(#) $Header: bpfdesc.h,v 1.9 91/10/27 21:22:38 mccanne Exp $ (LBL)

  */
 
 /*
  */
 
 /*


@@ -57,6 +47,9 @@ struct bpf_d {
        u_char          bd_state;       /* idle, waiting, or timed out */
        u_char          bd_selcoll;     /* true if selects collide */
        u_char          bd_immediate;   /* true to return on packet arrival */
        u_char          bd_state;       /* idle, waiting, or timed out */
        u_char          bd_selcoll;     /* true if selects collide */
        u_char          bd_immediate;   /* true to return on packet arrival */

+#if BSD < 199103
+       int             bd_timedout;
+#endif

 };
 
 /*
 };
 
 /*