diff options
| -rw-r--r-- | sys/net/if.c | 8 | ||||
| -rw-r--r-- | sys/netinet/ip_input.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/net/if.c b/sys/net/if.c index 5fcefb67ef1..8926e751a3d 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.277 2013/11/19 09:00:43 mpi Exp $ */ +/* $OpenBSD: if.c,v 1.278 2013/11/27 08:34:40 mpi Exp $ */ /* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */ /* @@ -853,18 +853,18 @@ if_congestion_clear(void *arg) */ /*ARGSUSED*/ struct ifaddr * -ifa_ifwithaddr(struct sockaddr *addr, u_int rdomain) +ifa_ifwithaddr(struct sockaddr *addr, u_int rtableid) { struct ifaddr_item *ifai, key; bzero(&key, sizeof(key)); key.ifai_addr = addr; - key.ifai_rdomain = rtable_l2(rdomain); + key.ifai_rdomain = rtable_l2(rtableid); ifai = RB_FIND(ifaddr_items, &ifaddr_items, &key); if (ifai) return (ifai->ifai_ifa); - return (NULL); + return (NULL); } #define equal(a1, a2) \ diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index ce269563fc4..6086893cd38 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_input.c,v 1.221 2013/11/17 10:07:32 bluhm Exp $ */ +/* $OpenBSD: ip_input.c,v 1.222 2013/11/27 08:34:39 mpi Exp $ */ /* $NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $ */ /* @@ -725,7 +725,7 @@ in_ouraddr(struct in_addr ina, struct mbuf *m) } struct in_ifaddr * -in_iawithaddr(struct in_addr ina, u_int rdomain) +in_iawithaddr(struct in_addr ina, u_int rtableid) { struct in_ifaddr *ia; struct sockaddr_in sin; @@ -734,7 +734,7 @@ in_iawithaddr(struct in_addr ina, u_int rdomain) sin.sin_len = sizeof(sin); sin.sin_family = AF_INET; sin.sin_addr = ina; - ia = ifatoia(ifa_ifwithaddr(sintosa(&sin), rdomain)); + ia = ifatoia(ifa_ifwithaddr(sintosa(&sin), rtableid)); if (ia == NULL || ina.s_addr == ia->ia_addr.sin_addr.s_addr) return (ia); |