diff --git a/share/man/man9/domain.9 b/share/man/man9/domain.9 index 14ae52b04bb7..464274bff994 100644 --- a/share/man/man9/domain.9 +++ b/share/man/man9/domain.9 @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 7, 2012 +.Dd November 6, 2014 .Dt DOMAIN 9 .Os .Sh NAME @@ -82,10 +82,9 @@ struct domain { (void **, int); int (*dom_rtdetach) /* clean up routing table */ (void **, int); - int dom_rtoffset; /* an arg to rtattach, in bits */ - int dom_maxrtkey; /* for routing layer */ void *(*dom_ifattach)(struct ifnet *); void (*dom_ifdetach)(struct ifnet *, void *); + int (*dom_ifmtu)(struct ifnet *); /* af-dependent data on ifnet */ }; .Ed diff --git a/sys/net/route.c b/sys/net/route.c index 67fb8a875086..23dbedc77319 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -264,15 +264,10 @@ vnet_route_init(const void *unused __unused) if (table != 0 && fam != AF_INET6 && fam != AF_INET) break; - /* - * XXX MRT rtattach will be also called from - * vfs_export.c but the offset will be 0 (only for - * AF_INET and AF_INET6 which don't need it anyhow). - */ rnh = rt_tables_get_rnh_ptr(table, fam); if (rnh == NULL) panic("%s: rnh NULL", __func__); - dom->dom_rtattach((void **)rnh, dom->dom_rtoffset); + dom->dom_rtattach((void **)rnh, 0); } } } diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c index 94d29e5be679..0ac91c72bb88 100644 --- a/sys/netinet/in_proto.c +++ b/sys/netinet/in_proto.c @@ -365,8 +365,6 @@ struct domain inetdomain = { #ifdef VIMAGE .dom_rtdetach = in_detachhead, #endif - .dom_rtoffset = 32, - .dom_maxrtkey = sizeof(struct sockaddr_in), .dom_ifattach = in_domifattach, .dom_ifdetach = in_domifdetach }; diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index e70a7398f001..1f7b19efbb3f 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -379,8 +379,6 @@ struct domain inet6domain = { #ifdef VIMAGE .dom_rtdetach = in6_detachhead, #endif - .dom_rtoffset = offsetof(struct sockaddr_in6, sin6_addr) << 3, - .dom_maxrtkey = sizeof(struct sockaddr_in6), .dom_ifattach = in6_domifattach, .dom_ifdetach = in6_domifdetach, .dom_ifmtu = in6_domifmtu diff --git a/sys/sys/domain.h b/sys/sys/domain.h index e17ae975c4d8..bacdad143f07 100644 --- a/sys/sys/domain.h +++ b/sys/sys/domain.h @@ -60,8 +60,6 @@ struct domain { (void **, int); int (*dom_rtdetach) /* clean up routing table */ (void **, int); - int dom_rtoffset; /* an arg to rtattach, in bits */ - int dom_maxrtkey; /* for routing layer */ void *(*dom_ifattach)(struct ifnet *); void (*dom_ifdetach)(struct ifnet *, void *); int (*dom_ifmtu)(struct ifnet *);