summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarius <marius@FreeBSD.org>2015-08-08 21:41:59 +0000
committermarius <marius@FreeBSD.org>2015-08-08 21:41:59 +0000
commitfbf037b7860fea316178507725020f03c5d77dbb (patch)
tree4fc652328851fd80dae998ce54f53434fed82116
parent31018e1fd38b5c648b3666ca7e36526ab9e45e89 (diff)
downloadFreeBSD-src-fbf037b7860fea316178507725020f03c5d77dbb.zip
FreeBSD-src-fbf037b7860fea316178507725020f03c5d77dbb.tar.gz
Fix compilation after r286457 w/o INVARIANTS or INVARIANT_SUPPORT.
-rw-r--r--sys/netinet/in.c6
-rw-r--r--sys/netinet6/in6.c6
2 files changed, 4 insertions, 8 deletions
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index f4eab74..9d3642e 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -1133,10 +1133,9 @@ in_lltable_delete(struct lltable *llt, u_int flags,
const struct sockaddr *l3addr)
{
const struct sockaddr_in *sin = (const struct sockaddr_in *)l3addr;
- struct ifnet *ifp = llt->llt_ifp;
struct llentry *lle;
- IF_AFDATA_WLOCK_ASSERT(ifp);
+ IF_AFDATA_WLOCK_ASSERT(llt->llt_ifp);
KASSERT(l3addr->sa_family == AF_INET,
("sin_family %d", l3addr->sa_family));
@@ -1226,12 +1225,11 @@ static struct llentry *
in_lltable_lookup(struct lltable *llt, u_int flags, const struct sockaddr *l3addr)
{
const struct sockaddr_in *sin = (const struct sockaddr_in *)l3addr;
- struct ifnet *ifp = llt->llt_ifp;
struct llentry *lle;
struct llentries *lleh;
u_int hashkey;
- IF_AFDATA_LOCK_ASSERT(ifp);
+ IF_AFDATA_LOCK_ASSERT(llt->llt_ifp);
KASSERT(l3addr->sa_family == AF_INET,
("sin_family %d", l3addr->sa_family));
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index f82fbbd..f7d2ac3 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -2178,10 +2178,9 @@ in6_lltable_delete(struct lltable *llt, u_int flags,
const struct sockaddr *l3addr)
{
const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6 *)l3addr;
- struct ifnet *ifp = llt->llt_ifp;
struct llentry *lle;
- IF_AFDATA_LOCK_ASSERT(ifp);
+ IF_AFDATA_LOCK_ASSERT(llt->llt_ifp);
KASSERT(l3addr->sa_family == AF_INET6,
("sin_family %d", l3addr->sa_family));
@@ -2264,10 +2263,9 @@ in6_lltable_lookup(struct lltable *llt, u_int flags,
const struct sockaddr *l3addr)
{
const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6 *)l3addr;
- struct ifnet *ifp = llt->llt_ifp;
struct llentry *lle;
- IF_AFDATA_LOCK_ASSERT(ifp);
+ IF_AFDATA_LOCK_ASSERT(llt->llt_ifp);
KASSERT(l3addr->sa_family == AF_INET6,
("sin_family %d", l3addr->sa_family));
OpenPOWER on IntegriCloud