diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-22 03:27:13 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-22 03:27:13 +0000 |
| commit | 79e69da63186c79e5faa344e42f5db3389f04916 (patch) | |
| tree | ffefde1e68dc493afabfc7a4e614f5ee1d004d8a /cpukit | |
| parent | 2004-04-22 Ralf Corsepius <ralf_corsepius@rtems.org> (diff) | |
| download | rtems-79e69da63186c79e5faa344e42f5db3389f04916.tar.bz2 | |
2004-04-22 Ralf Corsepius <ralf_corsepius@rtems.org>
* libnetworking/kern/uipc_socket.c: Partial update from FreeBSD
(Remove adv-clause from copyright notice).
* libnetworking/netinet/igmp_var.h: Partial update from FreeBSD.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 6 | ||||
| -rw-r--r-- | cpukit/libnetworking/kern/uipc_socket.c | 4 | ||||
| -rw-r--r-- | cpukit/libnetworking/netinet/igmp_var.h | 16 |
3 files changed, 14 insertions, 12 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 1c24ebea65..5667345c75 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,9 @@ +2004-04-22 Ralf Corsepius <ralf_corsepius@rtems.org> + + * libnetworking/kern/uipc_socket.c: Partial update from FreeBSD + (Remove adv-clause from copyright notice). + * libnetworking/netinet/igmp_var.h: Partial update from FreeBSD. + 2004-04-20 Ralf Corsepius <ralf_corsepius@rtems.org> * libnetworking/net/bpf.h, libnetworking/net/if.h, diff --git a/cpukit/libnetworking/kern/uipc_socket.c b/cpukit/libnetworking/kern/uipc_socket.c index a580cfea18..8ce3f0ef95 100644 --- a/cpukit/libnetworking/kern/uipc_socket.c +++ b/cpukit/libnetworking/kern/uipc_socket.c @@ -10,10 +10,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. 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. diff --git a/cpukit/libnetworking/netinet/igmp_var.h b/cpukit/libnetworking/netinet/igmp_var.h index 6f1d0d4700..b9855b3b8c 100644 --- a/cpukit/libnetworking/netinet/igmp_var.h +++ b/cpukit/libnetworking/netinet/igmp_var.h @@ -34,8 +34,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)igmp_var.h 8.1 (Berkeley) 7/19/93 - * $Id$ + * from: @(#)igmp_var.h 8.1 (Berkeley) 7/19/93 + * $FreeBSD: src/sys/netinet/igmp_var.h,v 1.19 2002/03/19 21:25:46 alfred Exp $ */ #ifndef _NETINET_IGMP_VAR_H_ @@ -87,12 +87,12 @@ extern struct igmpstat igmpstat; */ #define IGMP_AGE_THRESHOLD 540 -void igmp_init __P((void)); -void igmp_input __P((struct mbuf *, int)); -void igmp_joingroup __P((struct in_multi *)); -void igmp_leavegroup __P((struct in_multi *)); -void igmp_fasttimo __P((void)); -void igmp_slowtimo __P((void)); +void igmp_init(void); +void igmp_input(struct mbuf *, int); +void igmp_joingroup(struct in_multi *); +void igmp_leavegroup(struct in_multi *); +void igmp_fasttimo(void); +void igmp_slowtimo(void); SYSCTL_DECL(_net_inet_igmp); |