diff options
| author | Alan Somers <asomers@FreeBSD.org> | 2014-03-26 22:46:03 +0000 |
|---|---|---|
| committer | Alan Somers <asomers@FreeBSD.org> | 2014-03-26 22:46:03 +0000 |
| commit | 743c072a09a2ddef7ca4889cc6ce06f562260248 (patch) | |
| tree | 5c8439f7c5a34228e3acf856feb4ae38c790907e | |
| parent | 54ff5d7323e6b110e8796cdd412a39b7d13fb66d (diff) | |
Notes
| -rw-r--r-- | sys/netinet/if_ether.c | 4 | ||||
| -rw-r--r-- | sys/netinet/in.c | 5 | ||||
| -rwxr-xr-x | tests/sys/netinet/fibs_test.sh | 1 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index a26e179fd987d..f40c683be4e2a 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -334,8 +334,8 @@ retry: if (la == NULL) { if (flags & LLE_CREATE) log(LOG_DEBUG, - "arpresolve: can't allocate llinfo for %s\n", - inet_ntoa(SIN(dst)->sin_addr)); + "arpresolve: can't allocate llinfo for %s on %s\n", + inet_ntoa(SIN(dst)->sin_addr), ifp->if_xname); m_freem(m); return (EINVAL); } diff --git a/sys/netinet/in.c b/sys/netinet/in.c index e4a54b2716ded..b36d2e224ee97 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -994,8 +994,9 @@ in_lltable_rtcheck(struct ifnet *ifp, u_int flags, const struct sockaddr *l3addr KASSERT(l3addr->sa_family == AF_INET, ("sin_family %d", l3addr->sa_family)); - /* XXX rtalloc1 should take a const param */ - rt = rtalloc1(__DECONST(struct sockaddr *, l3addr), 0, 0); + /* XXX rtalloc1_fib should take a const param */ + rt = rtalloc1_fib(__DECONST(struct sockaddr *, l3addr), 0, 0, + ifp->if_fib); if (rt == NULL) return (EINVAL); diff --git a/tests/sys/netinet/fibs_test.sh b/tests/sys/netinet/fibs_test.sh index 5b58f71fa337c..d12ec4451a59c 100755 --- a/tests/sys/netinet/fibs_test.sh +++ b/tests/sys/netinet/fibs_test.sh @@ -55,7 +55,6 @@ arpresolve_checks_interface_fib_head() } arpresolve_checks_interface_fib_body() { - atf_expect_fail "kern/167947 arpresolve checks only the default FIB for the interface route" # Configure the TAP interfaces to use a RFC5737 nonrouteable addresses # and a non-default fib ADDR0="192.0.2.2" |