diff options
| author |   jca <jca@openbsd.org> | 2017-11-20 14:21:28 +0000 |
|---|---|---|
| committer | jca <jca@openbsd.org> | 2017-11-20 14:21:28 +0000 |
| commit | d99031112fd1e05bfa8c2a47c3a4ea6da2416489 (patch) | |
| tree | 7e37513bb76cd6820a5cff49be6d8e9b21be3127 | |
| parent | Keep kernel defines under #ifdef _KERNEL. (diff) | |
| download | wireguard-openbsd-d99031112fd1e05bfa8c2a47c3a4ea6da2416489.tar.xz wireguard-openbsd-d99031112fd1e05bfa8c2a47c3a4ea6da2416489.zip | |
Remove #if'0ed decls
Stop pretending that we will migrate the content of this file to
if_etherip.h. Those declarations are needed by userland, and it's
easier to keep them in netinet/ip_ether.h. ok visa@
| -rw-r--r-- | sys/net/if_etherip.h | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/sys/net/if_etherip.h b/sys/net/if_etherip.h index c95c03ef883..d42ed334990 100644 --- a/sys/net/if_etherip.h +++ b/sys/net/if_etherip.h @@ -17,57 +17,6 @@ #ifndef _NET_IF_ETHERIP_H_ #define _NET_IF_ETHERIP_H_ -#if 0 -/* - * TODO: - * At this stage, struct etheripstat and struct etherip_header, - * and EtherIP sysctl objects are present at netinet/ip_ether.h. - * When implementation of etherip is removed from gif(4), there - * are moved here. - */ - -struct etheripstat { - u_int64_t etherips_hdrops; /* packet shorter than header shows */ - u_int64_t etherips_qfull; /* bridge queue full, packet dropped */ - u_int64_t etherips_noifdrops; /* no interface/bridge information */ - u_int64_t etherips_pdrops; /* packet dropped due to policy */ - u_int64_t etherips_adrops; /* all other drops */ - u_int64_t etherips_ipackets; /* total input packets */ - u_int64_t etherips_opackets; /* total output packets */ - u_int64_t etherips_ibytes; /* input bytes */ - u_int64_t etherips_obytes; /* output bytes */ -}; - -struct etherip_header { -#if BYTE_ORDER == LITTLE_ENDIAN - unsigned int eip_res:4; /* reserved */ - unsigned int eip_ver:4; /* version */ -#endif -#if BYTE_ORDER == BIG_ENDIAN - unsigned int eip_ver:4; /* version */ - unsigned int eip_res:4; /* reserved */ -#endif - uint8_t eip_pad; /* required padding byte */ -} __packed; - -#define ETHERIP_VERSION 0x03 - -/* - * Names for Ether-IP sysctl objects - */ -#define ETHERIPCTL_ALLOW 1 /* accept incoming EtherIP packets */ -#define ETHERIPCTL_STATS 2 /* etherip stats */ -#define ETHERIPCTL_MAXID 3 - -#define ETHERIPCTL_NAMES { \ - { 0, 0 }, \ - { "allow", CTLTYPE_INT }, \ - { "stats", CTLTYPE_STRUCT }, \ -} - - -#endif /* 0 */ - int etherip_sysctl(int *, uint, void *, size_t *, void *, size_t); int ip_etherip_output(struct ifnet *, struct mbuf *); int ip_etherip_input(struct mbuf **, int *, int, int); @@ -77,5 +26,4 @@ int ip6_etherip_output(struct ifnet *, struct mbuf *); int ip6_etherip_input(struct mbuf **, int *, int, int); #endif /* INET6 */ - #endif /* _NET_IF_ETHERIP_H_ */ |