diff options
author | rwatson <rwatson@FreeBSD.org> | 2007-01-08 22:30:39 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2007-01-08 22:30:39 +0000 |
commit | bc556da94cf284f459efee9aee092835f991554c (patch) | |
tree | a5924867841dba8852686b98ede89a0cab19df1b /sys | |
parent | 59f7c3de6aaa41b759c58e383744eb37e8b24519 (diff) | |
download | FreeBSD-src-bc556da94cf284f459efee9aee092835f991554c.zip FreeBSD-src-bc556da94cf284f459efee9aee092835f991554c.tar.gz |
Factor out my copyrights + licenses from Charles D. Cranor and
University of Washington copyrights, which include the
advertising clause. Move $NetBSD$ into standard location for
FreeBSD source files, and normalize formatting.
MFC after: 3 days
Diffstat (limited to 'sys')
-rw-r--r-- | sys/netnatm/natm.c | 27 | ||||
-rw-r--r-- | sys/netnatm/natm.h | 7 | ||||
-rw-r--r-- | sys/netnatm/natm_pcb.c | 4 | ||||
-rw-r--r-- | sys/netnatm/natm_proto.c | 4 |
4 files changed, 32 insertions, 10 deletions
diff --git a/sys/netnatm/natm.c b/sys/netnatm/natm.c index 2496420..fd9fc01 100644 --- a/sys/netnatm/natm.c +++ b/sys/netnatm/natm.c @@ -1,8 +1,29 @@ -/* $NetBSD: natm.c,v 1.5 1996/11/09 03:26:26 chuck Exp $ */ /*- + * Copyright (c) 2005-2006 Robert N. M. Watson + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * * Copyright (c) 1996 Charles D. Cranor and Washington University. - * Copyright (c) 2005-2006 Robert N. M. Watson * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,6 +51,8 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $NetBSD: natm.c,v 1.5 1996/11/09 03:26:26 chuck Exp $ */ /* diff --git a/sys/netnatm/natm.h b/sys/netnatm/natm.h index 0a2ebb8..8a3fdc1 100644 --- a/sys/netnatm/natm.h +++ b/sys/netnatm/natm.h @@ -1,8 +1,4 @@ -/* $NetBSD: natm.h,v 1.1 1996/07/04 03:20:12 chuck Exp $ */ -/* $FreeBSD$ */ - /*- - * * Copyright (c) 1996 Charles D. Cranor and Washington University. * All rights reserved. * @@ -31,6 +27,9 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $NetBSD: natm.h,v 1.1 1996/07/04 03:20:12 chuck Exp $ + * $FreeBSD$ */ /* diff --git a/sys/netnatm/natm_pcb.c b/sys/netnatm/natm_pcb.c index da4317b..9cbc460 100644 --- a/sys/netnatm/natm_pcb.c +++ b/sys/netnatm/natm_pcb.c @@ -1,6 +1,4 @@ -/* $NetBSD: natm_pcb.c,v 1.4 1996/11/09 03:26:27 chuck Exp $ */ /*- - * * Copyright (c) 1996 Charles D. Cranor and Washington University. * All rights reserved. * @@ -29,6 +27,8 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $NetBSD: natm_pcb.c,v 1.4 1996/11/09 03:26:27 chuck Exp $ */ /* diff --git a/sys/netnatm/natm_proto.c b/sys/netnatm/natm_proto.c index 1ff619f..976f4b4 100644 --- a/sys/netnatm/natm_proto.c +++ b/sys/netnatm/natm_proto.c @@ -1,6 +1,4 @@ -/* $NetBSD: natm_proto.c,v 1.3 1996/09/18 00:56:41 chuck Exp $ */ /*- - * * Copyright (c) 1996 Charles D. Cranor and Washington University. * All rights reserved. * @@ -29,6 +27,8 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $NetBSD: natm_proto.c,v 1.3 1996/09/18 00:56:41 chuck Exp $ */ /* |