From owner-svn-src-all@freebsd.org Sat Jan 9 18:03:52 2016 Return-Path: Delivered-To: svn-src-all@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 86064A6975F; Sat, 9 Jan 2016 18:03:52 +0000 (UTC) (envelope-from jtl@freebsd.org) Received: from na01-bl2-obe.outbound.protection.outlook.com (mail-bl2on0107.outbound.protection.outlook.com [65.55.169.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "MSIT Machine Auth CA 2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B2C2615C5; Sat, 9 Jan 2016 18:03:51 +0000 (UTC) (envelope-from jtl@freebsd.org) Received: from CO2PR05CA024.namprd05.prod.outlook.com (10.141.241.152) by BN3PR0501MB1378.namprd05.prod.outlook.com (10.160.117.12) with Microsoft SMTP Server (TLS) id 15.1.361.13; Sat, 9 Jan 2016 17:49:10 +0000 Received: from BL2FFO11FD048.protection.gbl (2a01:111:f400:7c09::172) by CO2PR05CA024.outlook.office365.com (2a01:111:e400:1429::24) with Microsoft SMTP Server (TLS) id 15.1.365.19 via Frontend Transport; Sat, 9 Jan 2016 17:49:09 +0000 Authentication-Results: spf=softfail (sender IP is 66.129.239.19) smtp.mailfrom=freebsd.org; freebsd.org; dkim=none (message not signed) header.d=none;freebsd.org; dmarc=none action=none header.from=freebsd.org; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning freebsd.org discourages use of 66.129.239.19 as permitted sender) Received: from p-emfe01b-sac.jnpr.net (66.129.239.19) by BL2FFO11FD048.mail.protection.outlook.com (10.173.161.210) with Microsoft SMTP Server (TLS) id 15.1.355.15 via Frontend Transport; Sat, 9 Jan 2016 17:49:08 +0000 Received: from magenta.juniper.net (172.17.27.123) by p-emfe01b-sac.jnpr.net (172.24.192.21) with Microsoft SMTP Server (TLS) id 14.3.123.3; Sat, 9 Jan 2016 09:43:09 -0800 Received: from [172.29.33.83] ([172.29.33.83]) by magenta.juniper.net (8.11.3/8.11.3) with ESMTP id u09Hh4D18413; Sat, 9 Jan 2016 09:43:05 -0800 (PST) (envelope-from jtl@freebsd.org) User-Agent: Microsoft-MacOutlook/14.5.9.151119 Date: Sat, 9 Jan 2016 12:43:02 -0500 Subject: Re: svn commit: r293544 - in head/sys: net netinet ofed/drivers/infiniband/ulp/ipoib From: "Jonathan T. Looney" Sender: Jonathan Looney To: "Alexander V. Chernikov" , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Message-ID: Thread-Topic: svn commit: r293544 - in head/sys: net netinet ofed/drivers/infiniband/ulp/ipoib References: <201601091634.u09GYbwn041665@repo.freebsd.org> In-Reply-To: <201601091634.u09GYbwn041665@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD048; 1:/YTshlCOKm4ULDXN1pToQWO0tDmktkuDa0ted8NrTUM4WXUNCl85N39hYgceMWxgiKdWIe8o4DJo22bGEIeBBab8HYyC5KCGhxPFowAc2VsOT/xICYU+TFMuQyKTcbOkI1pge1xbT0QfwF397KghhvJh9wlKSXVfvPI/aIRwVwf1CLoKAL5IPnnbkOoDBd2BZcjGDgS3s0Z3VCL0s5MRGDs4Sy5PRayZw7XZ0LdhsntUSQiXtMzkGEfYpg2s2LUkTcpugVCIwXvZlwNiRBPt+2UYCtcaUiZtUBObRbo3kThsGEoZtwDxAEf+6ygaHy8JbV/fckbuGc5Xtrp1024sGo722FnFUBDVcKlZwWzFGaQ= X-Forefront-Antispam-Report: CIP:66.129.239.19; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(377454003)(24454002)(189002)(479174004)(199003)(1096002)(36756003)(105596002)(230700001)(16796002)(83506001)(87936001)(50986999)(1220700001)(23726003)(19580395003)(2906002)(6806005)(47776003)(5001960100002)(450100001)(69596002)(50466002)(189998001)(106466001)(81156007)(5001770100001)(54356999)(97736004)(86362001)(19580405001)(2501003)(76176999)(4001350100001)(2201001)(77096005)(46406003)(92566002)(107886002)(586003)(2950100001)(21314002)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:BN3PR0501MB1378; H:p-emfe01b-sac.jnpr.net; FPR:; SPF:SoftFail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN3PR0501MB1378; 2:P2uvaixzxQntDwJ6AjlUTiWuR/8YChFcIGtfEuF9GgjQAUCSoeicL3TBZnZ/bCtBd28dCXb8/dS0F7Z9d25AuMIJ71vTVg6YzvyD02wjXy0P05Qyx/WOER3QOqrrpyUwpkVb4wNsyGHpyxxeZq38hw==; 3:s8n6ljuMBAd+DuzNI/QY2CHpFWsm1mWYt3GWQulR+ll8l23rwVxCIDAvCC08yQ1fFH67akYsafo4JJm33XqWHGZDqsj07+ttaX3XOdeGeUdYGhcBqFKJEAj0P1BO79BXeiEqgYZz0vHU4Y2r8LHCz7cqHv+QqyD2QqDK1v4vxNdQFRt44OUOfdVhDpT0+qMm8mSCd3JkA6jdPwJKjGBwUSJnJb3KFHOqsQlx9gw8WXk=; 25:R6TULUDN72YF5yBRDOUjB2J35AsAFhyHYJXRNquQn7sP9VpplwHHUNf+MzL984OY5GAJR4+N3+owQUXxRzyT0i3jliSuCvTctUjEepGLKE8YUkwmf+npE2P9V+R8nnX+uqW0cbO78V1beYPV8FfS2mndFIa87efYRN+K8EK0GIfHgxiwbXOiWMIdHhjJ8+Ymb+nqfZ6FyDvP8xmAezu2UbsmVJ+2azORT2ogNt0n4MlAJ13qitbm8nuX0ZD52uvA X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN3PR0501MB1378; X-MS-Office365-Filtering-Correlation-Id: d02b14c1-6ff0-423d-4f5e-08d3191d2d03 X-Microsoft-Exchange-Diagnostics: 1; BN3PR0501MB1378; 20:bCYQLKH1OmnkrqYUqnfoPFtPa/pueq3J0qGrzdatVkuXzguh3nFmGwr4gpnbqF8F3VokyM/KOufOlvZDquw9xVvlSkjWL6AvFAQwgixzB5KNzSlVtYFVqHRtFTtF3rcwcgmr5tFs/R+1TAeHp+PFKAAUfLUa68mDCE2c+T3PY6BlZRbs3MHItXVbqOOMeNe1TbQIdEBvfUmJmng9ZopmlyNQ0yManU5hrDPuR4c3zi7nQnpvVU3QXYO4x3A7RaSlvDvkEcihlRS/KDIPm8Vy/1GRLw1AUUCAT2XYoarYMGdakhpI5J1vD7jRh8J8gV67CSjtDQaG0x4ws/KfpVknMhYwy7eH5EEx9HZrvIRMxVq08LNKRlw5yhIffoPWNQqD7cwacicVJf3afcbhUciqx0rvzkpdIEJPM58nEYyuS2hmumubgG1EC1fUZCzk/tFRSTmSRgmljzSQKjeVe/iVYQE3Kv/m1ZB9TZu1Gz4Qtn05a/Dqi+av5DARlFtZ+uZz; 4:Q3iiLbElmhymNWW5/qD4O5U8e88Y2XYJLZS9KNr+WZZFgw0Ocra0ILs3XeQE4Ndv21AgFBOJOWSUSIsmVqNbajsF2EnhJm49EimrmSmDsRhTHOYm2iTbOuvCr2hiKftc2iCXmkIpbfXzU8K0r6Y+MpUSr4OjULwJ9R20WhN9q9ChhamOPKA58NsEr50ryzGw5kXjyFRuj/hiXZmtAvg9JIkFZN5OwHBhSC9RkmCnA35cJUfkjfTu8sGgxX1AthQptrYEL5RM15ldJ6rQYI9i3nw1z/FtzMzBzWoHSpUUIbjzI+V1LawMb1dr6wZwHBMtv/s7gi1PPefLzcFZBey9m+cLBPKJWSmHh663jwi72FUVjn1UHhLh8SkFf4wCkIjvH0q/rrrVYcjHRdPIDaHQTi6lreWC+5k0thbBK+4DyFh3+L+63EutARJxhpsyeuWT X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(520078)(13015025)(13017025)(13018025)(8121501046)(3002001)(10201501046); SRVR:BN3PR0501MB1378; BCL:0; PCL:0; RULEID:; SRVR:BN3PR0501MB1378; X-Forefront-PRVS: 0816F1D86E X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR0501MB1378; 23:oNqxxzBJHegANf3ujUxSd3PQX77+ou4zdhcLiEG?= =?us-ascii?Q?+8v1QR3VyVHdkb7SGE8cWhAVrYAy4aul3Tfk89r9Jx+7VuXo9yG6+p4LD2oL?= =?us-ascii?Q?yZo4W3QbvQ3rBrq0ryzm5PMtHVDP4VkNfIcc9A9L1YZRHxmEmdlkKVMam/6d?= =?us-ascii?Q?xzGbnWlL98QOemyhKxcS5XsopmQAuJRlmJHF/SGsjipnuS7GloZkivUoSCQK?= =?us-ascii?Q?jwkwVw8oZvrmLls8tC+MPVwR5hUoqA81hkk1yr2IBI8O0KeTiFcWyNWqqRs3?= =?us-ascii?Q?ljgo3O2vjUTub7+6YKeHShylPGhsfyGSvl0lqFuWMbKvLFIdTqKLoeZq0Djj?= =?us-ascii?Q?0haxiDiG1G9pwtrdpl+/8I/ZZwPftOdM7rHELiSej13wV9lk694bSkQmqL11?= =?us-ascii?Q?J9cVqxVBQNDvi+QTCQ7b85jh0s13DyPFGopw+7Z+PjfSFBBuL3tgMDID7iDy?= =?us-ascii?Q?sgwkep/GgfVc8FVOJ41UsHVgzKq7fO+QBmadbHZcYL7XpwYJ/7n5i0HnzZSx?= =?us-ascii?Q?iL3Gthc3fX0LNbCENvnwwWpg3v3oYtyZ8iVHEgamEq3gwjENuA3D3AgBIxB1?= =?us-ascii?Q?COJygg0mTHadeXsX6ICZqV87S+bhP4kDOw9+jZ9inopLvUlFADbBc19DhEhv?= =?us-ascii?Q?zUm94RnNOTXcZ6/WqCGhUp/CalvEnfV3aqjzDnh8zn0onAF6SW3P1lR2md1G?= =?us-ascii?Q?jnAXnHZq3W8lRFO5mzXdxrERMZxQVZ9EoCmOblO6d1vkXGX3mS2TVKlOwMyV?= =?us-ascii?Q?VogzQulMJAX7ioduiwO2DR+gfUBriylhPnwX5Vwmsb7TVe1qCYQ2+6w2FHni?= =?us-ascii?Q?Hf0I5lM+Xqe9Hb/rrWkDBalSpGcHhxp5k3e0yc7lD+UiQOlxa0z+rjpJiPoO?= =?us-ascii?Q?zbMKorgBzofL71rzc7vkSxqBFVu5cCS3lXKPu7s1n+yqRvdknDd1Jf3tZg6N?= =?us-ascii?Q?fcCnL2LHwUjDrYlVTcRvgXfLVAAR725xrMZW8A+eoZMPrzKHaoi+cTbIHjC/?= =?us-ascii?Q?wvN6HNtWBb0iw4UgFm3R1ql82cieon1biFe68LfHkpCE4n6fb5zRBMkoFGa1?= =?us-ascii?Q?48PIpw7Doy4So1bNR5K4wIDCj6aMq3Pj6haesTD/SzCC46V3ce0ODjpYPBjY?= =?us-ascii?Q?m8NhZlPjBYXkRN6txTdF+wOoPDoap76Sq+vTnCRW+b6+CQB348dH08A=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN3PR0501MB1378; 5:RVuqZ00vmTSFtFifsTM/KJ9JqHXcR4nXJcx1wgmjjFmSkp8xhybAPmWoxkm8vLA7pX6nQ7hUdQkoGQHsFuxLgD5+RgNldMXxcS0ZYZgK8kWgMYYxQLELIcCo4HRTpjHD8odWJ1UboUXnQ+C2xwTMwA==; 24:yUHt//riHUbcgH6GCgBBEPzsdOUbQxBznD+rNL0iDeXtKpZiNWj++8+5fJx1Or4PQanPcSAxEOUMNJ0Z0weL9qs8D49vUO0RN5w5a3oVqcE= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jan 2016 17:49:08.5565 (UTC) X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4; Ip=[66.129.239.19]; Helo=[p-emfe01b-sac.jnpr.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR0501MB1378 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jan 2016 18:03:52 -0000 On 1/9/16, 11:34 AM, "owner-src-committers@freebsd.org on behalf of Alexander V. Chernikov" 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