diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-11-27 16:17:53 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-11-27 16:17:53 +0000 |
| commit | 18c625453b58c16b60538e16e55bec4008a4d535 (patch) | |
| tree | 8080e38d9bc31c8919309716a0f23e6b6191f511 /sys/net | |
| parent | b97d0929d000563e85362f123ec27e0be58a40de (diff) | |
Keep "struct vxlan_softc" private to prevent pulling more headers when
<net/if_vxlan.h> is included.
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if_vxlan.c | 21 | ||||
| -rw-r--r-- | sys/net/if_vxlan.h | 21 |
2 files changed, 21 insertions, 21 deletions
diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c index 2669dceef8c..e7a1a228b49 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vxlan.c,v 1.33 2015/10/25 12:05:40 mpi Exp $ */ +/* $OpenBSD: if_vxlan.c,v 1.34 2015/11/27 16:17:52 mpi Exp $ */ /* * Copyright (c) 2013 Reyk Floeter <reyk@openbsd.org> @@ -57,6 +57,25 @@ #include <net/if_vxlan.h> +struct vxlan_softc { + struct arpcom sc_ac; + struct ifmedia sc_media; + + struct ip_moptions sc_imo; + void *sc_ahcookie; + void *sc_lhcookie; + void *sc_dhcookie; + + struct sockaddr_storage sc_src; + struct sockaddr_storage sc_dst; + in_port_t sc_dstport; + u_int sc_rdomain; + int sc_vnetid; + u_int8_t sc_ttl; + + LIST_ENTRY(vxlan_softc) sc_entry; +}; + void vxlanattach(int); int vxlanioctl(struct ifnet *, u_long, caddr_t); void vxlanstart(struct ifnet *); diff --git a/sys/net/if_vxlan.h b/sys/net/if_vxlan.h index 2ec1752954c..1d7201ea7de 100644 --- a/sys/net/if_vxlan.h +++ b/sys/net/if_vxlan.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vxlan.h,v 1.7 2015/10/23 01:19:04 dlg Exp $ */ +/* $OpenBSD: if_vxlan.h,v 1.8 2015/11/27 16:17:52 mpi Exp $ */ /* * Copyright (c) 2013 Reyk Floeter <reyk@openbsd.org> @@ -40,25 +40,6 @@ struct vxlanudpiphdr { } __packed; #ifdef _KERNEL -struct vxlan_softc { - struct arpcom sc_ac; - struct ifmedia sc_media; - - struct ip_moptions sc_imo; - void *sc_ahcookie; - void *sc_lhcookie; - void *sc_dhcookie; - - struct sockaddr_storage sc_src; - struct sockaddr_storage sc_dst; - in_port_t sc_dstport; - u_int sc_rdomain; - int sc_vnetid; - u_int8_t sc_ttl; - - LIST_ENTRY(vxlan_softc) sc_entry; -}; - extern int vxlan_enable; int vxlan_lookup(struct mbuf *, struct udphdr *, int, |