From owner-svn-src-projects@FreeBSD.ORG Fri Nov 21 23:36:23 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 22E7CDB7; Fri, 21 Nov 2014 23:36:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 03F0AD10; Fri, 21 Nov 2014 23:36:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sALNaMf3065646; Fri, 21 Nov 2014 23:36:22 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sALNaMbo065632; Fri, 21 Nov 2014 23:36:22 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411212336.sALNaMbo065632@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Fri, 21 Nov 2014 23:36:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274830 - in projects/routing/sys: netinet netinet6 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Nov 2014 23:36:23 -0000 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 #include #include +#include #include #include #include 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 #include #include +#include #include #include #include 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 #include #include +#include #include #include #include