svn commit: r274830 - in projects/routing/sys: netinet netinet6

[Alexander V. Chernikov]

Author: melifaro
Date: Fri Nov 21 23:36:21 2014
New Revision: 274830
URL: https://svnweb.freebsd.org/changeset/base/274830

Log:
  Finish r274774: add more headers/fix build for non-debug case.

Modified:
  projects/routing/sys/netinet/if_ether.c
  projects/routing/sys/netinet/in.c
  projects/routing/sys/netinet/toecore.c
  projects/routing/sys/netinet6/scope6.c

Modified: projects/routing/sys/netinet/if_ether.c
==============================================================================
--- projects/routing/sys/netinet/if_ether.c	Fri Nov 21 23:25:27 2014	(r274829)
+++ projects/routing/sys/netinet/if_ether.c	Fri Nov 21 23:36:21 2014	(r274830)
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
+#include <sys/lock.h>
 #include <sys/rmlock.h>
 #include <sys/proc.h>
 #include <sys/socket.h>

Modified: projects/routing/sys/netinet/in.c
==============================================================================
--- projects/routing/sys/netinet/in.c	Fri Nov 21 23:25:27 2014	(r274829)
+++ projects/routing/sys/netinet/in.c	Fri Nov 21 23:36:21 2014	(r274830)
@@ -1078,10 +1078,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_LOCK_ASSERT(llt->llt_ifp);
 	KASSERT(l3addr->sa_family == AF_INET,
 	    ("sin_family %d", l3addr->sa_family));
 
@@ -1191,11 +1190,10 @@ in_lltable_unlink(struct llentry *lle)
 static struct llentry *
 in_lltable_lookup(struct lltable *llt, u_int flags, const struct sockaddr *l3addr)
 {
-	struct ifnet *ifp = llt->llt_ifp;
 	struct llentry *lle;
 	struct in_addr dst;
 
-	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: projects/routing/sys/netinet/toecore.c
==============================================================================
--- projects/routing/sys/netinet/toecore.c	Fri Nov 21 23:25:27 2014	(r274829)
+++ projects/routing/sys/netinet/toecore.c	Fri Nov 21 23:36:21 2014	(r274830)
@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/module.h>
+#include <sys/lock.h>
 #include <sys/rmlock.h>
 #include <sys/types.h>
 #include <sys/sockopt.h>

Modified: projects/routing/sys/netinet6/scope6.c
==============================================================================
--- projects/routing/sys/netinet6/scope6.c	Fri Nov 21 23:25:27 2014	(r274829)
+++ projects/routing/sys/netinet6/scope6.c	Fri Nov 21 23:36:21 2014	(r274830)
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
+#include <sys/lock.h>
 #include <sys/rmlock.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>