diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-12-03 05:07:56 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-12-03 05:07:56 +0000 |
commit | 751c51343c0a0769c1f6829dd2051c7cf263272c (patch) | |
tree | 7b4726582754dd3541e67646e0820bca41aa13dc | |
parent | 2004-12-02 Ralf Corsepius <ralf.corsepius@rtems.org> (diff) | |
download | rtems-751c51343c0a0769c1f6829dd2051c7cf263272c.tar.bz2 |
2004-12-03 Ralf Corsepius <ralf.corsepius@rtems.org>
* libnetworking/net/if_ethersubr.c,
libnetworking/net/radix.h,
libnetworking/netinet/if_ether.h,
libnetworking/netinet/igmp_var.h,
libnetworking/netinet/in_var.h,
libnetworking/netinet/tcp_timer.h,
libnetworking/netinet/udp_usrreq.c,
libnetworking/rtems/rtems_glue.c:
Misc. updates from FreeBSD and bugfixes tripped by GCC-4.0.0.
-rw-r--r-- | cpukit/ChangeLog | 12 | ||||
-rw-r--r-- | cpukit/libnetworking/net/if_ethersubr.c | 8 | ||||
-rw-r--r-- | cpukit/libnetworking/net/radix.h | 2 | ||||
-rw-r--r-- | cpukit/libnetworking/netinet/if_ether.h | 16 | ||||
-rw-r--r-- | cpukit/libnetworking/netinet/igmp_var.h | 2 | ||||
-rw-r--r-- | cpukit/libnetworking/netinet/in_var.h | 4 | ||||
-rw-r--r-- | cpukit/libnetworking/netinet/tcp_timer.h | 1 | ||||
-rw-r--r-- | cpukit/libnetworking/netinet/udp_usrreq.c | 4 | ||||
-rw-r--r-- | cpukit/libnetworking/rtems/rtems_glue.c | 3 |
9 files changed, 25 insertions, 27 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 8b066423e0..16959e6bdf 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,15 @@ +2004-12-03 Ralf Corsepius <ralf.corsepius@rtems.org> + + * libnetworking/net/if_ethersubr.c, + libnetworking/net/radix.h, + libnetworking/netinet/if_ether.h, + libnetworking/netinet/igmp_var.h, + libnetworking/netinet/in_var.h, + libnetworking/netinet/tcp_timer.h, + libnetworking/netinet/udp_usrreq.c, + libnetworking/rtems/rtems_glue.c: + Misc. updates from FreeBSD and bugfixes tripped by GCC-4.0.0. + 2004-12-02 Ralf Corsepius <ralf.corsepius@rtems.org> * libnetworking/kern/kern_sysctl.c, diff --git a/cpukit/libnetworking/net/if_ethersubr.c b/cpukit/libnetworking/net/if_ethersubr.c index 4ae25fbbeb..50c1d48cd7 100644 --- a/cpukit/libnetworking/net/if_ethersubr.c +++ b/cpukit/libnetworking/net/if_ethersubr.c @@ -554,10 +554,18 @@ ether_ifattach(struct ifnet *ifp) } } +#if defined(__rtems__) +u_char ether_ipmulticast_min[6] = + { 0x01, 0x00, 0x5e, 0x00, 0x00, 0x00 }; +u_char ether_ipmulticast_max[6] = + { 0x01, 0x00, 0x5e, 0x7f, 0xff, 0xff }; +#else static u_char ether_ipmulticast_min[6] = { 0x01, 0x00, 0x5e, 0x00, 0x00, 0x00 }; static u_char ether_ipmulticast_max[6] = { 0x01, 0x00, 0x5e, 0x7f, 0xff, 0xff }; +#endif + /* * Add an Ethernet multicast address or range of addresses to the list for a * given interface. diff --git a/cpukit/libnetworking/net/radix.h b/cpukit/libnetworking/net/radix.h index 51290580dd..cf132a4ab9 100644 --- a/cpukit/libnetworking/net/radix.h +++ b/cpukit/libnetworking/net/radix.h @@ -147,8 +147,6 @@ struct radix_node_head { #define Free(p) free((caddr_t)p, M_RTABLE); #endif /*_KERNEL*/ -extern struct radix_node_head *mask_rnhead; - void rn_init(void); int rn_inithead(void **, int); int rn_refines(void *, void *); diff --git a/cpukit/libnetworking/netinet/if_ether.h b/cpukit/libnetworking/netinet/if_ether.h index 0623156615..b033c2a93c 100644 --- a/cpukit/libnetworking/netinet/if_ether.h +++ b/cpukit/libnetworking/netinet/if_ether.h @@ -40,22 +40,6 @@ #include <net/ethernet.h> #include <net/if_arp.h> -#define ETHERTYPE_PUP 0x0200 /* PUP protocol */ -#define ETHERTYPE_IP 0x0800 /* IP protocol */ -#define ETHERTYPE_ARP 0x0806 /* Addr. resolution protocol */ -#define ETHERTYPE_REVARP 0x8035 /* reverse Addr. resolution protocol */ - -/* - * The ETHERTYPE_NTRAILER packet types starting at ETHERTYPE_TRAIL have - * (type-ETHERTYPE_TRAIL)*512 bytes of data followed - * by an ETHER type (as given above) and then the (variable-length) header. - */ -#define ETHERTYPE_TRAIL 0x1000 /* Trailer packet */ -#define ETHERTYPE_NTRAILER 16 - -#define ETHERMTU (ETHER_MAX_LEN-ETHER_HDR_LEN-ETHER_CRC_LEN) -#define ETHERMIN (ETHER_MIN_LEN-ETHER_HDR_LEN-ETHER_CRC_LEN) - #ifdef _KERNEL /* * Macro to map an IP multicast address to an Ethernet multicast address. diff --git a/cpukit/libnetworking/netinet/igmp_var.h b/cpukit/libnetworking/netinet/igmp_var.h index d515d80199..d1454e0521 100644 --- a/cpukit/libnetworking/netinet/igmp_var.h +++ b/cpukit/libnetworking/netinet/igmp_var.h @@ -59,8 +59,6 @@ struct igmpstat { }; #ifdef _KERNEL -extern struct igmpstat igmpstat; - #define IGMP_RANDOM_DELAY(X) (random() % (X) + 1) /* diff --git a/cpukit/libnetworking/netinet/in_var.h b/cpukit/libnetworking/netinet/in_var.h index dc6876b05c..505d99e6a2 100644 --- a/cpukit/libnetworking/netinet/in_var.h +++ b/cpukit/libnetworking/netinet/in_var.h @@ -1,3 +1,4 @@ +/* $Id */ /* * Copyright (c) 1985, 1986, 1993 * The Regents of the University of California. All rights reserved. @@ -86,9 +87,6 @@ extern struct in_ifaddr *in_ifaddr; extern struct ifqueue ipintrq; /* ip packet input queue */ extern struct in_addr zeroin_addr; extern u_char inetctlerrmap[]; -extern int rtq_reallyold; /* XXX */ -extern int rtq_minreallyold; /* XXX */ -extern int rtq_toomany; /* XXX */ /* * Macro for finding the interface (ifnet structure) corresponding to one diff --git a/cpukit/libnetworking/netinet/tcp_timer.h b/cpukit/libnetworking/netinet/tcp_timer.h index e83f7a4f22..4bbbb712b6 100644 --- a/cpukit/libnetworking/netinet/tcp_timer.h +++ b/cpukit/libnetworking/netinet/tcp_timer.h @@ -125,7 +125,6 @@ static char *tcptimers[] = #ifdef _KERNEL extern int tcp_keepinit; /* time to establish connection */ extern int tcp_keepidle; /* time before keepalive probes begin */ -extern int tcp_keepintvl; /* time between keepalive probes */ extern int tcp_maxidle; /* time to drop after starting probes */ extern int tcp_ttl; /* time to live for TCP segs */ extern int tcp_backoff[]; diff --git a/cpukit/libnetworking/netinet/udp_usrreq.c b/cpukit/libnetworking/netinet/udp_usrreq.c index 697469f96e..6fdb8d17bd 100644 --- a/cpukit/libnetworking/netinet/udp_usrreq.c +++ b/cpukit/libnetworking/netinet/udp_usrreq.c @@ -73,8 +73,8 @@ static int log_in_vain = 0; SYSCTL_INT(_net_inet_udp, OID_AUTO, log_in_vain, CTLFLAG_RW, &log_in_vain, 0, ""); -static struct inpcbhead udb; /* from udp_var.h */ -static struct inpcbinfo udbinfo; +struct inpcbhead udb; /* from udp_var.h */ +struct inpcbinfo udbinfo; #ifndef UDBHASHSIZE #define UDBHASHSIZE 64 diff --git a/cpukit/libnetworking/rtems/rtems_glue.c b/cpukit/libnetworking/rtems/rtems_glue.c index cded876081..74a7ca8511 100644 --- a/cpukit/libnetworking/rtems/rtems_glue.c +++ b/cpukit/libnetworking/rtems/rtems_glue.c @@ -73,7 +73,8 @@ int rtems_bsdnet_microseconds_per_tick; * Callout processing */ static rtems_interval ticksWhenCalloutsLastChecked; -static struct callout *callfree, calltodo; +struct callout *callfree = NULL; +struct callout calltodo; /* * FreeBSD variables |