new copyright; att/bsd/shared

SCCS-vsn: sys/net/bpf.h 7.1
SCCS-vsn: sys/net/bpf_filter.c 7.1
SCCS-vsn: sys/net/bpfdesc.h 7.1
SCCS-vsn: sys/net/if_slvar.h 7.7

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)

  */
 
 /*
  */
 
 /*

diff --git a/usr/src/sys/net/bpf_filter.c b/usr/src/sys/net/bpf_filter.c
index 798af03..bcfb585 100644 (file)
--- a/usr/src/sys/net/bpf_filter.c
+++ b/usr/src/sys/net/bpf_filter.c
@@ -1,27 +1,18 @@
-/*
- * Copyright (c) 1990 The Regents of the University of California.
+/*-
+ * Copyright (c) 1991 The 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 of Lawrence Berkeley Laboratory.
+ *
+ * %sccs.include.redist.c%
+ *
+ *     @(#)bpf_filter.c        7.1 (Berkeley) %G%
+ *
+ * static char rcsid[] =
+ * "@(#) $Header: bpf_filter.c,v 1.10 91/04/24 22:07:07 mccanne Locked $ (LBL)";

  */
  */

-#if !(defined(lint) || defined(KERNEL))
-static char rcsid[] =
-    "@(#) $Header: bpf_filter.c,v 1.10 91/04/24 22:07:07 mccanne Locked $ (LBL)";
-#endif

 
 #include <sys/param.h>
 #include <sys/types.h>
 
 #include <sys/param.h>
 #include <sys/types.h>

diff --git a/usr/src/sys/net/bpfdesc.h b/usr/src/sys/net/bpfdesc.h
index e36fbe9..80e0049 100644 (file)
--- a/usr/src/sys/net/bpfdesc.h
+++ b/usr/src/sys/net/bpfdesc.h
@@ -1,27 +1,16 @@
-/*
- * Copyright (c) 1990 The Regents of the University of California.
+/*-
+ * Copyright (c) 1991 The 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 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.1 (Berkeley) %G%
+ *
+ * @(#) $Header: bpfdesc.h,v 1.7 90/12/04 01:05:01 mccanne Exp $ (LBL)

  */
 
 /*
  */
 
 /*

diff --git a/usr/src/sys/net/if_slvar.h b/usr/src/sys/net/if_slvar.h
index 1ab4487..c8723e3 100644 (file)
--- a/usr/src/sys/net/if_slvar.h
+++ b/usr/src/sys/net/if_slvar.h
@@ -1,12 +1,19 @@
-/*     @(#)if_slvar.h  7.6 (Berkeley) %G% */
+/*-
+ * Copyright (c) 1991 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * %sccs.include.redist.c%
+ *
+ *     @(#)if_slvar.h  7.7 (Berkeley) %G%
+ *
+ * $Header: if_slvar.h,v 1.3 89/05/31 02:25:18 van Exp $
+ */

 
 /*
  * Definitions for SLIP interface data structures
  * 
 
 /*
  * Definitions for SLIP interface data structures
  * 

- * (this exists so programs like slstats can get at the definition
+ * (This exists so programs like slstats can get at the definition

  *  of sl_softc.)
  *  of sl_softc.)

- *
- * $Header: if_slvar.h,v 1.3 89/05/31 02:25:18 van Exp $

  */
 struct sl_softc {
        struct  ifnet sc_if;            /* network-visible interface */
  */
 struct sl_softc {
        struct  ifnet sc_if;            /* network-visible interface */