From 7554bb3a75ef437583b5590fd9daadaac112ef3f Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 8 Nov 2005 14:24:28 +0000 Subject: 2005-11-08 Joel Sherrill * libnetworking/net/if.h: Add forward reference declaration to struct mbuf so ifru_tap callback is properly typed. * libnetworking/rtems/rtems_bsdnet.h: Add definition of _BSD_VISIBLE which needs to be defined so various pieces of the .h files are visible to device drives. --- cpukit/ChangeLog | 8 ++++++++ cpukit/libnetworking/net/if.h | 6 ++++-- cpukit/libnetworking/rtems/rtems_bsdnet.h | 2 ++ 3 files changed, 14 insertions(+), 2 deletions(-) (limited to 'cpukit') diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 1e330ea15b..eadf272521 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,11 @@ +2005-11-08 Joel Sherrill + + * libnetworking/net/if.h: Add forward reference declaration to + struct mbuf so ifru_tap callback is properly typed. + * libnetworking/rtems/rtems_bsdnet.h: Add definition of _BSD_VISIBLE + which needs to be defined so various pieces of the .h files are + visible to device drives. + 2005-11-08 Ralf Corsepius * libnetworking/Makefile.am: Comment out using diff --git a/cpukit/libnetworking/net/if.h b/cpukit/libnetworking/net/if.h index 55571e14f9..8f7b6d95ba 100644 --- a/cpukit/libnetworking/net/if.h +++ b/cpukit/libnetworking/net/if.h @@ -194,6 +194,9 @@ struct ifa_msghdr { int ifam_metric; /* value of ifa_metric */ }; +/* forward declaration */ +struct mbuf; + /* * Interface request structure used for socket * ioctl's. All interface ioctl's must have parameter @@ -212,8 +215,7 @@ struct ifreq { int ifru_phys; int ifru_media; caddr_t ifru_data; - /* third argument must be cast to a struct mbuf * */ - int (*ifru_tap)(struct ifnet *, struct ether_header *, void *); + int (*ifru_tap)(struct ifnet *, struct ether_header *, struct mbuf *); } ifr_ifru; #define ifr_addr ifr_ifru.ifru_addr /* address */ #define ifr_dstaddr ifr_ifru.ifru_dstaddr /* other end of p-to-p link */ diff --git a/cpukit/libnetworking/rtems/rtems_bsdnet.h b/cpukit/libnetworking/rtems/rtems_bsdnet.h index c6471cd279..7c7c2c8df4 100644 --- a/cpukit/libnetworking/rtems/rtems_bsdnet.h +++ b/cpukit/libnetworking/rtems/rtems_bsdnet.h @@ -24,6 +24,7 @@ #undef NFS #undef DIAGNOSTIC #undef BOOTP_COMPAT +#undef __BSD_VISIBLE #define _COMPILING_BSD_KERNEL_ #define _KERNEL @@ -31,6 +32,7 @@ #define NFS #define DIAGNOSTIC #define BOOTP_COMPAT +#define __BSD_VISIBLE 1 #endif /* -- cgit v1.2.3