This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
NET/BSD_TCPIP: Fixed some compiler warnings
- From: Nick Garnett <nickg at ecoscentric dot com>
- To: ecos-patches at sources dot redhat dot com
- Date: 24 Jul 2003 19:05:48 +0100
- Subject: NET/BSD_TCPIP: Fixed some compiler warnings
Index: ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/bsd_tcpip/current/ChangeLog,v
retrieving revision 1.28
diff -u -5 -r1.28 ChangeLog
--- ChangeLog 26 Jun 2003 05:56:06 -0000 1.28
+++ ChangeLog 24 Jul 2003 18:03:09 -0000
@@ -1,5 +1,15 @@
+2003-07-24 Nick Garnett <nickg@balti.calivar.com>
+
+ * include/netinet/in.h:
+ * src/sys/kern/uipc_accf.c:
+ * src/sys/kern/uipc_socket.c:
+ * src/sys/net/route.c:
+ * src/sys/netinet/ip_icmp.c:
+ * src/sys/netinet/ip_input.c:
+ Fixed some compiler warnings.
+
2003-06-12 Motoya Kurotsu <kurotsu@allied-telesis.co.jp>
* src/sys/netinet/ip_input.c(ip_reass):
ip_nfragpackets is increasing by dropping fragments due to mbuf
starvation and eventually exceeds ip_maxfragpackets, which
Index: include/netinet/in.h
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/bsd_tcpip/current/include/netinet/in.h,v
retrieving revision 1.3
diff -u -5 -r1.3 in.h
--- include/netinet/in.h 14 Jun 2003 15:03:03 -0000 1.3
+++ include/netinet/in.h 24 Jul 2003 18:03:11 -0000
@@ -503,13 +503,20 @@
#include <netinet6/in6.h>
#undef __KAME_NETINET_IN_H_INCLUDED_
#ifdef _KERNEL
+struct ip;
+struct mbuf;
+
int in_broadcast __P((struct in_addr, struct ifnet *));
int in_canforward __P((struct in_addr));
int in_cksum __P((struct mbuf *, int));
+u_int in_cksum_hdr __P((const struct ip *));
+u_short in_cksum_skip __P((struct mbuf *, int, int));
+u_short in_pseudo __P((u_int32_t, u_int32_t, u_int32_t));
+u_short in_addword __P((u_short, u_short));
int in_localaddr __P((struct in_addr));
char *inet_ntoa __P((struct in_addr));
#endif
Index: src/sys/kern/uipc_accf.c
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/bsd_tcpip/current/src/sys/kern/uipc_accf.c,v
retrieving revision 1.1
diff -u -5 -r1.1 uipc_accf.c
--- src/sys/kern/uipc_accf.c 20 May 2002 22:25:02 -0000 1.1
+++ src/sys/kern/uipc_accf.c 24 Jul 2003 18:03:12 -0000
@@ -58,11 +58,13 @@
#include <sys/queue.h>
static SLIST_HEAD(, accept_filter) accept_filtlsthd =
SLIST_HEAD_INITIALIZER(&accept_filtlsthd);
+#ifdef ACCEPT_FILTER_MOD
static int unloadable = 0;
+#endif
/*
* must be passed a malloc'd structure so we don't explode if the kld
* is unloaded, we leak the struct on deallocation to deal with this,
* but if a filter is loaded with the same name as a leaked one we re-use
Index: src/sys/kern/uipc_socket.c
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/bsd_tcpip/current/src/sys/kern/uipc_socket.c,v
retrieving revision 1.2
diff -u -5 -r1.2 uipc_socket.c
--- src/sys/kern/uipc_socket.c 12 Feb 2003 15:29:52 -0000 1.2
+++ src/sys/kern/uipc_socket.c 24 Jul 2003 18:03:15 -0000
@@ -106,11 +106,11 @@
* are tied up in the TCP close process.
*/
struct socket *
soalloc(int waitok)
{
- struct socket *so;
+ struct socket *so = NULL;
int maxtries = waitok ? 10 : 1;
while (maxtries-- > 0) {
so = zalloci(socket_zone);
if (so) {
Index: src/sys/net/route.c
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/bsd_tcpip/current/src/sys/net/route.c,v
retrieving revision 1.2
diff -u -5 -r1.2 route.c
--- src/sys/net/route.c 23 Apr 2003 08:54:13 -0000 1.2
+++ src/sys/net/route.c 24 Jul 2003 18:03:21 -0000
@@ -90,10 +90,15 @@
if (dom->dom_rtattach)
dom->dom_rtattach(&table[dom->dom_family],
dom->dom_rtoffset);
}
+static void call_route_init( void * arg )
+{
+ route_init();
+}
+
void
route_init()
{
rn_init(); /* initialize all zeroes, all ones, mask table */
rtable_init((void **)rt_tables);
@@ -1180,6 +1185,6 @@
}
return (error);
}
/* This must be before ip6_init2(), which is now SI_ORDER_MIDDLE */
-SYSINIT(route, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, route_init, 0);
+SYSINIT(route, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, call_route_init, 0);
Index: src/sys/netinet/ip_icmp.c
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/bsd_tcpip/current/src/sys/netinet/ip_icmp.c,v
retrieving revision 1.2
diff -u -5 -r1.2 ip_icmp.c
--- src/sys/netinet/ip_icmp.c 23 Jun 2003 10:17:29 -0000 1.2
+++ src/sys/netinet/ip_icmp.c 24 Jul 2003 18:03:22 -0000
@@ -96,11 +96,12 @@
*/
static int icmplim = 200;
#else
-static int icmplim = -1;
+/* static int icmplim = -1; */
+
#endif
/*
* ICMP broadcast echo sysctl
*/
Index: src/sys/netinet/ip_input.c
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/bsd_tcpip/current/src/sys/netinet/ip_input.c,v
retrieving revision 1.2
diff -u -5 -r1.2 ip_input.c
--- src/sys/netinet/ip_input.c 26 Jun 2003 05:56:06 -0000 1.2
+++ src/sys/netinet/ip_input.c 24 Jul 2003 18:03:34 -0000
@@ -99,11 +99,13 @@
int ipforwarding = 0;
static int ipsendredirects = 1; /* XXX */
int ip_defttl = IPDEFTTL;
static int ip_dosourceroute = 0;
static int ip_acceptsourceroute = 0;
+#if defined(NFAITH) && 0 < NFAITH
static int ip_keepfaith = 0;
+#endif
static int nipq = 0; /* total # of reass queues */
static int maxnipq;
/*
* XXX - Setting ip_checkinterface mostly implements the receive side of
--
Nick Garnett eCos Kernel Architect
http://www.ecoscentric.com The eCos and RedBoot experts