diff options
Diffstat (limited to 'sys/netinet/in_gif.c')
-rw-r--r-- | sys/netinet/in_gif.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c index 11e32c3..fe2c9ee 100644 --- a/sys/netinet/in_gif.c +++ b/sys/netinet/in_gif.c @@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$"); #include <netinet/in_var.h> #include <netinet/ip_encap.h> #include <netinet/ip_ecn.h> -#include <netinet/vinet.h> #ifdef INET6 #include <netinet/ip6.h> @@ -86,16 +85,12 @@ struct protosw in_gif_protosw = { .pr_usrreqs = &rip_usrreqs }; -#ifdef VIMAGE_GLOBALS -extern int ip_gif_ttl; -#endif -SYSCTL_V_INT(V_NET, vnet_gif, _net_inet_ip, IPCTL_GIF_TTL, gifttl, - CTLFLAG_RW, ip_gif_ttl, 0, ""); +SYSCTL_VNET_INT(_net_inet_ip, IPCTL_GIF_TTL, gifttl, CTLFLAG_RW, + &VNET_NAME(ip_gif_ttl), 0, ""); int in_gif_output(struct ifnet *ifp, int family, struct mbuf *m) { - INIT_VNET_GIF(ifp->if_vnet); struct gif_softc *sc = ifp->if_softc; struct sockaddr_in *dst = (struct sockaddr_in *)&sc->gif_ro.ro_dst; struct sockaddr_in *sin_src = (struct sockaddr_in *)sc->gif_psrc; @@ -273,7 +268,6 @@ in_gif_output(struct ifnet *ifp, int family, struct mbuf *m) void in_gif_input(struct mbuf *m, int off) { - INIT_VNET_INET(curvnet); struct ifnet *gifp = NULL; struct gif_softc *sc; struct ip *ip; @@ -368,7 +362,6 @@ in_gif_input(struct mbuf *m, int off) static int gif_validate4(const struct ip *ip, struct gif_softc *sc, struct ifnet *ifp) { - INIT_VNET_INET(curvnet); struct sockaddr_in *src, *dst; struct in_ifaddr *ia4; |