From owner-svn-src-head@freebsd.org Sat Jan 9 18:44:03 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B75F7A68D8A; Sat, 9 Jan 2016 18:44:03 +0000 (UTC) (envelope-from melifaro@ipfw.ru) Received: from forward19j.cmail.yandex.net (forward19j.cmail.yandex.net [IPv6:2a02:6b8:0:1630::f6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "forwards.mail.yandex.net", Issuer "Yandex CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 74AF713CE; Sat, 9 Jan 2016 18:44:03 +0000 (UTC) (envelope-from melifaro@ipfw.ru) Received: from web29j.yandex.ru (web29j.yandex.ru [5.45.198.70]) by forward19j.cmail.yandex.net (Yandex) with ESMTP id 4FDAD2145E; Sat, 9 Jan 2016 21:43:50 +0300 (MSK) Received: from 127.0.0.1 (localhost [127.0.0.1]) by web29j.yandex.ru (Yandex) with ESMTP id 804AA68024E1; Sat, 9 Jan 2016 21:43:49 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfw.ru; s=mail; t=1452365029; bh=2rxVUW1j0AGwuBi+C4LPyke5UQUbeefhnkmrogYCtAw=; h=From:To:In-Reply-To:References:Subject:Date; b=R228YAdXN4aANMxRbrAsTSHKCptfeU+SnsBcp2Gmg+rfd726nLiGXONxzMI/FvtoH aHKZ3lKr/MhsamdHzHrdkDHIma4bTktP1K+jKEM19LCqEfBH95GUah6hziGBv5+fF6 ix3PxDTIM3BYBpE42HFvaOJhvUBEnNx8okeCV+3s= Received: by web29j.yandex.ru with HTTP; Sat, 09 Jan 2016 21:43:49 +0300 From: Alexander V. Chernikov To: Jonathan T. Looney , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" In-Reply-To: References: <201601091634.u09GYbwn041665@repo.freebsd.org> Subject: Re: svn commit: r293544 - in head/sys: net netinet ofed/drivers/infiniband/ulp/ipoib MIME-Version: 1.0 Message-Id: <2757471452365029@web29j.yandex.ru> X-Mailer: Yamail [ http://yandex.ru ] 5.0 Date: Sat, 09 Jan 2016 21:43:49 +0300 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=koi8-r X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jan 2016 18:44:03 -0000 Thanks, should be fixed in r293611. 09.01.2016, 21:04, "Jonathan T. Looney" : > On 1/9/16, 11:34 AM, "owner-src-committers@freebsd.org on behalf of > Alexander V. Chernikov" melifaro@FreeBSD.org> wrote: > >> Modified: head/sys/net/route.h >> ========================================================================== >> ==== >> --- head/sys/net/route.h Sat Jan 9 16:33:55 2016 (r293543) >> +++ head/sys/net/route.h Sat Jan 9 16:34:37 2016 (r293544) >> @@ -64,9 +64,13 @@ struct route { >> >> š#define RT_CACHING_CONTEXT 0x1 /* XXX: not used anywhere */ >> š#define RT_NORTREF 0x2 /* doesn't hold reference on ro_rt */ >> -#define RT_L2_ME (1 << RT_L2_ME_BIT) >> -#define RT_MAY_LOOP (1 << RT_MAY_LOOP_BIT) >> -#define RT_HAS_HEADER (1 << RT_HAS_HEADER_BIT) >> +#define RT_L2_ME (1 << RT_L2_ME_BIT) /* 0x0004 */ >> +#define RT_MAY_LOOP (1 << RT_MAY_LOOP_BIT) /* 0x0008 */ >> +#define RT_HAS_HEADER (1 << RT_HAS_HEADER_BIT) /* 0x0010 */ >> + >> +#define RT_REJECT 0x0020 /* Destination is reject */ >> +#define RT_BLACKHOLE 0x0040 /* Destination is blackhole */ >> +#define RT_HAS_GW 0x0080 /* Destination has GW */ >> >> šstruct rt_metrics { >> šššššššššu_long rmx_locks; /* Kernel must leave these values alone */ >> @@ -215,6 +219,19 @@ fib_rte_to_nh_flags(int rt_flags) >> šššššššššreturn (res); >> š} >> >> +/* rte<>ro_flags translation */ >> +static inline void >> +rt_update_ro_flags(struct route *ro) >> +{ >> + int rt_flags = ro->ro_rt->rt_flags; >> + >> + ro->ro_flags &= ~ (RT_REJECT|RT_BLACKHOLE|RT_HAS_GW); >> + >> + ro->ro_flags = (rt_flags & RTF_REJECT) ? RT_REJECT : 0; >> + ro->ro_flags |= (rt_flags & RTF_BLACKHOLE) ? RT_BLACKHOLE : 0; >> + ro->ro_flags |= (rt_flags & RTF_GATEWAY) ? RT_HAS_GW : 0; >> +} >> + >> š/* >> šš* Routing statistics. >> šš*/ > > rt_update_ro_flags() probably needs to be wrapped in the same #if check > that encloses the struct rtentry definition: > > ššš#if defined(_KERNEL) || defined(_WANT_RTENTRY) > > Jonathan