new copyright; att/bsd/shared

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

diff --git a/usr/src/sys/net/bpf.h b/usr/src/sys/net/bpf.h
index ab9dbe6..3f4a910 100644 (file)
--- a/usr/src/sys/net/bpf.h
+++ b/usr/src/sys/net/bpf.h
@@ -1,27 +1,16 @@
-/*
+/*-

  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1990 The Regents of the University of California.
  * 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 of Lawrence Berkeley Laboratory.

  *
  *

- * @(#) $Header: bpf.h,v 1.20 91/04/24 22:06:24 mccanne Locked $ (LBL)
+ * %sccs.include.redist.c%

  *
  *

- * This code is derived from the Stanford/CMU enet packet filter,
- * (net/enet.h) distributed with 4.3BSD Unix.
+ *     @(#)bpf.h       7.1 (Berkeley) %G%
+ *
+ * @(#) $Header: bpf.h,v 1.20 91/04/24 22:06:24 mccanne Locked $ (LBL)

  */
 
 /*
  */
 
 /*