2010-06-18 Ralf Corsépius <ralf.corsepius@rtems.org>

	* libnetworking/netinet/if_ether.c: Misc. 64bit fixes from FreeBSD.
	* libfs/src/nfsclient/src/rpcio.c: Misc. 64bit fixes.

3 files changed, 19 insertions, 12 deletions

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 074b32baa3..a9f5d63edf 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-18	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* libnetworking/netinet/if_ether.c: Misc. 64bit fixes from FreeBSD.
+	* libfs/src/nfsclient/src/rpcio.c: Misc. 64bit fixes.
+
 2010-06-18	Chris Johns <chrisj@rtems.org>
 
         * libfs/src/rfs/rtems-rfs-file-block.c: Clean up uint64_t
diff --git a/cpukit/libfs/src/nfsclient/src/rpcio.c b/cpukit/libfs/src/nfsclient/src/rpcio.c
index d462774558..3316cccb5f 100644
--- a/cpukit/libfs/src/nfsclient/src/rpcio.c
+++ b/cpukit/libfs/src/nfsclient/src/rpcio.c
@@ -65,6 +65,8 @@
 #include "config.h"
 #endif
 
+#include <inttypes.h>
+
 #include <rtems.h>
 #include <rtems/error.h>
 #include <rtems/rtems_bsdnet.h>
@@ -1658,7 +1660,7 @@ static RpcUdpXact
 sockRcv(void)
 {
 int					len,i;
-u_long				xid;
+uint32_t				xid;
 union {
 	struct sockaddr_in	sin;
 	struct sockaddr     sa;
@@ -1743,9 +1745,9 @@ RpcUdpXact			xact     = 0;
 #endif
 			} else {
 			fprintf(stderr,"RPCIO WARNING sockRcv(): transaction mismatch\n");
-			fprintf(stderr,"xact: xid  0x%08lx  -- got 0x%08lx\n",
+			fprintf(stderr,"xact: xid  0x%08" PRIx32 "  -- got 0x%08" PRIx32 "\n",
 							xact->obuf.xid, xid);
-			fprintf(stderr,"xact: addr 0x%08lx  -- got 0x%08lx\n",
+			fprintf(stderr,"xact: addr 0x%08" PRIx32 "  -- got 0x%08" PRIx32 "\n",
 							xact->server->addr.sin.sin_addr.s_addr,
 							fromAddr.sin.sin_addr.s_addr);
 			fprintf(stderr,"xact: port 0x%08x  -- got 0x%08x\n",
@@ -1754,7 +1756,7 @@ RpcUdpXact			xact     = 0;
 			}
 		} else {
 			fprintf(stderr,
-					"RPCIO WARNING sockRcv(): got xid 0x%08lx but its slot is empty\n",
+					"RPCIO WARNING sockRcv(): got xid 0x%08" PRIx32 " but its slot is empty\n",
 					xid);
 		}
 		/* forget about this one and try again */
diff --git a/cpukit/libnetworking/netinet/if_ether.c b/cpukit/libnetworking/netinet/if_ether.c
index ebacc1e860..984077eab4 100644
--- a/cpukit/libnetworking/netinet/if_ether.c
+++ b/cpukit/libnetworking/netinet/if_ether.c
@@ -111,7 +111,7 @@ SYSCTL_INT(_net_link_ether_inet, OID_AUTO, proxyall, CTLFLAG_RW,
 	   &arp_proxyall, 0, "");
 
 static void	arp_rtrequest(int, struct rtentry *, struct sockaddr *);
-static void	arprequest(struct arpcom *, u_long *, u_long *, u_char *);
+static void	arprequest(struct arpcom *, struct in_addr *, struct in_addr *, u_char *);
 void	arpintr(void);
 static void	arptfree(struct llinfo_arp *);
 static void	arptimer(void *);
@@ -189,8 +189,8 @@ arp_rtrequest(int req, struct rtentry *rt, struct sockaddr *sa)
 		/* Announce a new entry if requested. */
 		if (rt->rt_flags & RTF_ANNOUNCE)
 			arprequest((struct arpcom *)rt->rt_ifp,
-			    &SIN(rt_key(rt))->sin_addr.s_addr,
-			    &SIN(rt_key(rt))->sin_addr.s_addr,
+			    &SIN(rt_key(rt))->sin_addr,
+			    &SIN(rt_key(rt))->sin_addr,
 			    (u_char *)LLADDR(SDL(gate)));
 		/*FALLTHROUGH*/
 	case RTM_RESOLVE:
@@ -278,7 +278,7 @@ arp_rtrequest(int req, struct rtentry *rt, struct sockaddr *sa)
  *	- arp header source ethernet address
  */
 static void
-arprequest(struct arpcom *ac, u_long *sip, u_long *tip, u_char *enaddr)
+arprequest(struct arpcom *ac, struct in_addr *sip, struct in_addr *tip, u_char *enaddr)
 {
 	struct mbuf *m;
 	struct ether_header *eh;
@@ -375,8 +375,8 @@ arpresolve(
 			rt->rt_expire = rtems_bsdnet_seconds_since_boot();
 			if (la->la_asked++ < arp_maxtries)
 			    arprequest(ac,
-			        &(SIN(rt->rt_ifa->ifa_addr)->sin_addr.s_addr),
-				&(SIN(dst)->sin_addr.s_addr),
+			        &(SIN(rt->rt_ifa->ifa_addr)->sin_addr),
+				&(SIN(dst)->sin_addr),
 				ac->ac_enaddr);
 			else {
 				rt->rt_flags |= RTF_REJECT;
@@ -635,8 +635,8 @@ void
 arp_ifinit(struct arpcom *ac, struct ifaddr *ifa)
 {
 	if (ntohl(IA_SIN(ifa)->sin_addr.s_addr) != INADDR_ANY)
-		arprequest(ac, &(IA_SIN(ifa)->sin_addr.s_addr),
-			       &(IA_SIN(ifa)->sin_addr.s_addr), ac->ac_enaddr);
+		arprequest(ac, &(IA_SIN(ifa)->sin_addr),
+			       &(IA_SIN(ifa)->sin_addr), ac->ac_enaddr);
 	ifa->ifa_rtrequest = arp_rtrequest;
 	ifa->ifa_flags |= RTF_CLONING;
 }