From ab6934acf915037e65fbde84fc5470086778f25b Mon Sep 17 00:00:00 2001 From: dyoung Date: Thu, 15 May 2008 04:03:53 +0000 Subject: [PATCH] Note both my contribution and NSF funding. --- sys/net/if_gre.c | 9 +++++++-- sys/net/if_gre.h | 10 ++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c index fee4d4f297f2..31ba9d59df71 100644 --- a/sys/net/if_gre.c +++ b/sys/net/if_gre.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_gre.c,v 1.133 2008/05/15 01:30:48 dyoung Exp $ */ +/* $NetBSD: if_gre.c,v 1.134 2008/05/15 04:03:53 dyoung Exp $ */ /* * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc. @@ -9,6 +9,8 @@ * * IPv6-over-GRE contributed by Gert Doering * + * GRE over UDP/IPv4/IPv6 sockets contributed by David Young + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -29,6 +31,9 @@ * 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. + * + * This material is based upon work partially supported by NSF + * under Contract No. NSF CNS-0626584. */ /* @@ -40,7 +45,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_gre.c,v 1.133 2008/05/15 01:30:48 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_gre.c,v 1.134 2008/05/15 04:03:53 dyoung Exp $"); #include "opt_gre.h" #include "opt_inet.h" diff --git a/sys/net/if_gre.h b/sys/net/if_gre.h index bf749a95999d..7b560dcae4bb 100644 --- a/sys/net/if_gre.h +++ b/sys/net/if_gre.h @@ -1,12 +1,15 @@ -/* $NetBSD: if_gre.h,v 1.37 2008/05/09 20:14:07 dyoung Exp $ */ +/* $NetBSD: if_gre.h,v 1.38 2008/05/15 04:03:53 dyoung Exp $ */ /* - * Copyright (c) 1998 The NetBSD Foundation, Inc. + * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation * by Heiko W.Rupp * + * This code is derived from software contributed to The NetBSD Foundation + * by David Young + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -27,6 +30,9 @@ * 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. + * + * This material is based upon work partially supported by NSF + * under Contract No. NSF CNS-0626584. */ #ifndef _NET_IF_GRE_H_