Mirrors_Framework/rtems
1
0
Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-09-24 21:31:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

2004-12-03 Ralf Corsepius <ralf.corsepius@rtems.org>

Browse Source 
* 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.
This commit is contained in:
Ralf Corsepius
2004-12-03 05:07:56 +00:00
parent 46a1aa9efa
commit 751c51343c
9 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpukit/ChangeLog
+12
View File
@@ -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,
cpukit/libnetworking/net/if_ethersubr.c
+8
View File
@@ -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.
cpukit/libnetworking/net/radix.h
-2
View File
@@ -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 *);
cpukit/libnetworking/netinet/if_ether.h
-16
View File
@@ -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.
cpukit/libnetworking/netinet/igmp_var.h
-2
View File
@@ -59,8 +59,6 @@ struct igmpstat {
};
#ifdef _KERNEL
extern struct igmpstat igmpstat;
#define IGMP_RANDOM_DELAY(X) (random() % (X) + 1)
/*
cpukit/libnetworking/netinet/in_var.h
+1 -3
View File
@@ -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
cpukit/libnetworking/netinet/tcp_timer.h
-1
View File
@@ -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[];
cpukit/libnetworking/netinet/udp_usrreq.c
+2 -2
View File
@@ -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
cpukit/libnetworking/rtems/rtems_glue.c
+2 -1
View File
@@ -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