diff options
| author | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2013-11-21 16:34:34 +0000 |
|---|---|---|
| committer | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2013-11-21 16:34:34 +0000 |
| commit | 2bc29ac36442f27159144a7e7fb8f37c22e7af5e (patch) | |
| tree | c9c383d0150a8b15902f5f472cde9daea161a7d1 /sys | |
| parent | 1ddacc6a9fc2989bf1a73c69e8a2e3698676435e (diff) | |
hide a bunch of structures (namely arpcom, llinfo_arp, ethernet
multicast macros and in_ifaddr) that reference ifnet in some way;
looked over by deraadt, ok mpi
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet/if_ether.h | 7 | ||||
| -rw-r--r-- | sys/netinet/in_var.h | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sys/netinet/if_ether.h b/sys/netinet/if_ether.h index 9ef9c12b2f3..10c8b0703a2 100644 --- a/sys/netinet/if_ether.h +++ b/sys/netinet/if_ether.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ether.h,v 1.51 2013/08/28 06:58:57 mpi Exp $ */ +/* $OpenBSD: if_ether.h,v 1.52 2013/11/21 16:34:33 mikeb Exp $ */ /* $NetBSD: if_ether.h,v 1.22 1996/05/11 13:00:00 mycroft Exp $ */ /* @@ -146,6 +146,7 @@ struct ether_arp { #define arp_pln ea_hdr.ar_pln #define arp_op ea_hdr.ar_op +#ifdef _KERNEL /* * Structure shared between the ethernet driver modules and * the address resolution code. For example, each ec_softc or il_softc @@ -171,6 +172,7 @@ struct llinfo_arp { }; #define MAX_HOLD_QUEUE 10 #define MAX_HOLD_TOTAL 100 +#endif struct sockaddr_inarp { u_int8_t sin_len; @@ -206,7 +208,6 @@ void arp_rtrequest(int, struct rtentry *); int ether_addmulti(struct ifreq *, struct arpcom *); int ether_delmulti(struct ifreq *, struct arpcom *); int ether_multiaddr(struct sockaddr *, u_int8_t[], u_int8_t[]); -#endif /* _KERNEL */ /* * Ethernet multicast address structure. There is one of these for each @@ -274,8 +275,6 @@ do { \ ETHER_NEXT_MULTI((step), (enm)); \ } while (/* CONSTCOND */ 0) -#ifdef _KERNEL - #ifdef NFSCLIENT extern struct ifnet *revarp_ifp; #endif /* NFSCLIENT */ diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h index b95801b1674..e76cdba5f71 100644 --- a/sys/netinet/in_var.h +++ b/sys/netinet/in_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: in_var.h,v 1.27 2013/11/21 09:08:38 mpi Exp $ */ +/* $OpenBSD: in_var.h,v 1.28 2013/11/21 16:34:33 mikeb Exp $ */ /* $NetBSD: in_var.h,v 1.16 1996/02/13 23:42:15 christos Exp $ */ /* @@ -37,6 +37,7 @@ #include <sys/queue.h> +#ifdef _KERNEL /* * Interface address, Internet version. One of these structures * is allocated for each interface with an Internet address. @@ -59,6 +60,7 @@ struct in_ifaddr { struct in_multi *ia_allhosts; /* multicast address record for the allhosts multicast group */ }; +#endif struct in_aliasreq { char ifra_name[IFNAMSIZ]; /* if name, e.g. "en0" */ |