From owner-svn-src-projects@FreeBSD.ORG Fri Feb 27 00:26:18 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C9A32166; Fri, 27 Feb 2015 00:26:18 +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 AB400FC8; Fri, 27 Feb 2015 00:26:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1R0QID6015015; Fri, 27 Feb 2015 00:26:18 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1R0QIMP015014; Fri, 27 Feb 2015 00:26:18 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201502270026.t1R0QIMP015014@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Fri, 27 Feb 2015 00:26:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r279339 - projects/ifnet/sys/net 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, 27 Feb 2015 00:26:19 -0000 Author: glebius Date: Fri Feb 27 00:26:17 2015 New Revision: 279339 URL: https://svnweb.freebsd.org/changeset/base/279339 Log: Inline if_route() and if_unroute(). Modified: projects/ifnet/sys/net/if.c Modified: projects/ifnet/sys/net/if.c ============================================================================== --- projects/ifnet/sys/net/if.c Thu Feb 26 23:05:46 2015 (r279338) +++ projects/ifnet/sys/net/if.c Fri Feb 27 00:26:17 2015 (r279339) @@ -161,9 +161,7 @@ static void if_attachdomain1(struct ifne static int ifconf(u_long, caddr_t); static void if_freemulti(struct ifmultiaddr *); static void if_grow(void); -static void if_route(struct ifnet *, int flag, int fam); static int if_setflag(struct ifnet *, int, int, int *, int); -static void if_unroute(struct ifnet *, int flag, int fam); static void link_rtrequest(int, struct rtentry *, struct rt_addrinfo *); static int if_rtdel(struct radix_node *, void *); static int if_delmulti_locked(struct ifnet *, struct ifmultiaddr *, int); @@ -2113,53 +2111,6 @@ link_init_sdl(struct ifnet *ifp, struct return (sdl); } -/* - * Mark an interface down and notify protocols of - * the transition. - */ -static void -if_unroute(struct ifnet *ifp, int flag, int fam) -{ - struct ifaddr *ifa; - - KASSERT(flag == IFF_UP, ("if_unroute: flag != IFF_UP")); - - ifp->if_flags &= ~flag; - getmicrotime(&ifp->if_lastchange); - TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) - if (fam == PF_UNSPEC || (fam == ifa->ifa_addr->sa_family)) - pfctlinput(PRC_IFDOWN, ifa->ifa_addr); - if_qflush(ifp); - - if (ifp->if_carp) - (*carp_linkstate_p)(ifp); - rt_ifmsg(ifp); -} - -/* - * Mark an interface up and notify protocols of - * the transition. - */ -static void -if_route(struct ifnet *ifp, int flag, int fam) -{ - struct ifaddr *ifa; - - KASSERT(flag == IFF_UP, ("if_route: flag != IFF_UP")); - - ifp->if_flags |= flag; - getmicrotime(&ifp->if_lastchange); - TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) - if (fam == PF_UNSPEC || (fam == ifa->ifa_addr->sa_family)) - pfctlinput(PRC_IFUP, ifa->ifa_addr); - if (ifp->if_carp) - (*carp_linkstate_p)(ifp); - rt_ifmsg(ifp); -#ifdef INET6 - in6_if_up(ifp); -#endif -} - void (*vlan_link_state_p)(struct ifnet *); /* XXX: private from if_vlan */ void (*vlan_trunk_cap_p)(struct ifnet *); /* XXX: private from if_vlan */ struct ifnet *(*vlan_trunkdev_p)(struct ifnet *); @@ -2229,8 +2180,16 @@ do_link_state_change(void *arg, int pend void if_down(struct ifnet *ifp) { + struct ifaddr *ifa; - if_unroute(ifp, IFF_UP, AF_UNSPEC); + ifp->if_flags &= ~IFF_UP; + getmicrotime(&ifp->if_lastchange); + TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) + pfctlinput(PRC_IFDOWN, ifa->ifa_addr); + if_qflush(ifp); + if (ifp->if_carp) + (*carp_linkstate_p)(ifp); + rt_ifmsg(ifp); } /* @@ -2240,8 +2199,18 @@ if_down(struct ifnet *ifp) void if_up(struct ifnet *ifp) { + struct ifaddr *ifa; - if_route(ifp, IFF_UP, AF_UNSPEC); + ifp->if_flags |= IFF_UP; + getmicrotime(&ifp->if_lastchange); + TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) + pfctlinput(PRC_IFUP, ifa->ifa_addr); + if (ifp->if_carp) + (*carp_linkstate_p)(ifp); + rt_ifmsg(ifp); +#ifdef INET6 + in6_if_up(ifp); +#endif } /*