diff --git a/sys/net/if.c b/sys/net/if.c index aa44b786362..585269a2c93 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1550,9 +1550,6 @@ ifa_switch_loopback_route(struct ifaddr *ifa, struct sockaddr *sa, int fib) * to perform a different comparison. */ -#define sa_equal(a1, a2) \ - (bcmp((a1), (a2), ((a1))->sa_len) == 0) - #define sa_dl_equal(a1, a2) \ ((((struct sockaddr_dl *)(a1))->sdl_len == \ ((struct sockaddr_dl *)(a2))->sdl_len) && \ diff --git a/sys/net/route.c b/sys/net/route.c index f2df0803be5..623772a479e 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -125,10 +125,6 @@ VNET_DEFINE(int, rttrash); /* routes not in table but not freed */ #define V_rttrash VNET(rttrash) -/* compare two sockaddr structures */ -#define sa_equal(a1, a2) (((a1)->sa_len == (a2)->sa_len) && \ - (bcmp((a1), (a2), (a1)->sa_len) == 0)) - /* * Convert a 'struct radix_node *' to a 'struct rtentry *'. * The operation can be done safely (in this code) because a diff --git a/sys/net/route.h b/sys/net/route.h index 4ac3458dd3a..913828a5ccc 100644 --- a/sys/net/route.h +++ b/sys/net/route.h @@ -275,6 +275,10 @@ struct rt_addrinfo { sizeof(long) : \ 1 + ( (((struct sockaddr *)(sa))->sa_len - 1) | (sizeof(long) - 1) ) ) +#define sa_equal(a, b) ( \ + (((struct sockaddr *)(a))->sa_len == ((struct sockaddr *)(b))->sa_len) && \ + (bcmp((a), (b), ((struct sockaddr *)(b))->sa_len) == 0)) + #ifdef _KERNEL #define RT_LINK_IS_UP(ifp) (!((ifp)->if_capabilities & IFCAP_LINKSTATE) \ diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 13aa050ac81..02f44d6fd21 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -517,7 +517,6 @@ rtm_get_jailed(struct rt_addrinfo *info, struct ifnet *ifp, static int route_output(struct mbuf *m, struct socket *so) { -#define sa_equal(a1, a2) (bcmp((a1), (a2), (a1)->sa_len) == 0) struct rt_msghdr *rtm = NULL; struct rtentry *rt = NULL; struct radix_node_head *rnh; @@ -960,7 +959,6 @@ flush: Free(rtm); } return (error); -#undef sa_equal } static void diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index 239c95052df..a33341d8f0c 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -695,8 +695,6 @@ passin: int bad; bad = 1; -#define sa_equal(a1, a2) \ - (bcmp((a1), (a2), ((a1))->sin6_len) == 0) IF_ADDR_RLOCK(ifp); TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { if (ifa->ifa_addr->sa_family != dst6.sin6_family) @@ -706,7 +704,6 @@ passin: } KASSERT(ifa != NULL, ("%s: ifa not found for lle %p", __func__, lle)); -#undef sa_equal ia6 = (struct in6_ifaddr *)ifa; if (!(ia6->ia6_flags & IN6_IFF_NOTREADY)) {