svn commit: r286478 - in head/sys: netinet netinet6

[Marius Strobl]

Author: marius
Date: Sat Aug  8 21:41:59 2015
New Revision: 286478
URL: https://svnweb.freebsd.org/changeset/base/286478

Log:
  Fix compilation after r286457 w/o INVARIANTS or INVARIANT_SUPPORT.

Modified:
  head/sys/netinet/in.c
  head/sys/netinet6/in6.c

Modified: head/sys/netinet/in.c
==============================================================================
--- head/sys/netinet/in.c       Sat Aug  8 21:32:03 2015        (r286477)
+++ head/sys/netinet/in.c       Sat Aug  8 21:41:59 2015        (r286478)
@@ -1133,10 +1133,9 @@ in_lltable_delete(struct lltable *llt, u
     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));
 

Modified: head/sys/netinet6/in6.c
==============================================================================
--- head/sys/netinet6/in6.c     Sat Aug  8 21:32:03 2015        (r286477)
+++ head/sys/netinet6/in6.c     Sat Aug  8 21:41:59 2015        (r286478)
@@ -2178,10 +2178,9 @@ in6_lltable_delete(struct lltable *llt, 
        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, 
        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));
 
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"