From owner-svn-src-projects@FreeBSD.ORG Mon Jan 12 13:44:36 2015 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 2D05B929; Mon, 12 Jan 2015 13:44:36 +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 0E0BCE97; Mon, 12 Jan 2015 13:44:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0CDiZ2a017571; Mon, 12 Jan 2015 13:44:35 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0CDiZ4p017568; Mon, 12 Jan 2015 13:44:35 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201501121344.t0CDiZ4p017568@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Mon, 12 Jan 2015 13:44:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r277069 - in projects/ifnet/sys: net 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: Mon, 12 Jan 2015 13:44:36 -0000 Author: glebius Date: Mon Jan 12 13:44:34 2015 New Revision: 277069 URL: https://svnweb.freebsd.org/changeset/base/277069 Log: Remove if_m?addr_r(un)?lock(). The drivers will use if_foreach_addr() and if_foreach_maddr(). The rest of the kernel can use macros. Modified: projects/ifnet/sys/net/if.c projects/ifnet/sys/net/if_var.h projects/ifnet/sys/netinet6/in6.c Modified: projects/ifnet/sys/net/if.c ============================================================================== --- projects/ifnet/sys/net/if.c Mon Jan 12 13:21:23 2015 (r277068) +++ projects/ifnet/sys/net/if.c Mon Jan 12 13:44:34 2015 (r277069) @@ -1739,40 +1739,6 @@ if_data_copy(struct ifnet *ifp, struct i } /* - * Wrapper functions for struct ifnet address list locking macros. These are - * used by kernel modules to avoid encoding programming interface or binary - * interface assumptions that may be violated when kernel-internal locking - * approaches change. - */ -void -if_addr_rlock(struct ifnet *ifp) -{ - - IF_ADDR_RLOCK(ifp); -} - -void -if_addr_runlock(struct ifnet *ifp) -{ - - IF_ADDR_RUNLOCK(ifp); -} - -void -if_maddr_rlock(if_t ifp) -{ - - IF_ADDR_RLOCK((struct ifnet *)ifp); -} - -void -if_maddr_runlock(if_t ifp) -{ - - IF_ADDR_RUNLOCK((struct ifnet *)ifp); -} - -/* * Initialization, destruction and refcounting functions for ifaddrs. */ struct ifaddr * Modified: projects/ifnet/sys/net/if_var.h ============================================================================== --- projects/ifnet/sys/net/if_var.h Mon Jan 12 13:21:23 2015 (r277068) +++ projects/ifnet/sys/net/if_var.h Mon Jan 12 13:44:34 2015 (r277069) @@ -182,16 +182,6 @@ struct ifnet { #define IF_ADDR_LOCK_ASSERT(if) rw_assert(&(if)->if_addr_lock, RA_LOCKED) #define IF_ADDR_WLOCK_ASSERT(if) rw_assert(&(if)->if_addr_lock, RA_WLOCKED) -/* - * Function variations on locking macros intended to be used by loadable - * kernel modules in order to divorce them from the internals of address list - * locking. - */ -void if_addr_rlock(struct ifnet *ifp); /* if_addrhead */ -void if_addr_runlock(struct ifnet *ifp); /* if_addrhead */ -void if_maddr_rlock(if_t ifp); /* if_multiaddrs */ -void if_maddr_runlock(if_t ifp); /* if_multiaddrs */ - #ifdef _KERNEL #ifdef _SYS_EVENTHANDLER_H_ /* interface link layer address change event */ Modified: projects/ifnet/sys/netinet6/in6.c ============================================================================== --- projects/ifnet/sys/netinet6/in6.c Mon Jan 12 13:21:23 2015 (r277068) +++ projects/ifnet/sys/netinet6/in6.c Mon Jan 12 13:44:34 2015 (r277069) @@ -1542,7 +1542,7 @@ in6ifa_llaonifp(struct ifnet *ifp) if (ND_IFINFO(ifp)->flags & ND6_IFF_IFDISABLED) return (NULL); - if_addr_rlock(ifp); + IF_ADDR_RLOCK(ifp); TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { if (ifa->ifa_addr->sa_family != AF_INET6) continue; @@ -1552,7 +1552,7 @@ in6ifa_llaonifp(struct ifnet *ifp) IN6_IS_ADDR_MC_NODELOCAL(&sin6->sin6_addr)) break; } - if_addr_runlock(ifp); + IF_ADDR_RUNLOCK(ifp); return ((struct in6_ifaddr *)ifa); }