From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robert Shearman Subject: Re: [PATCH net-next RFC v2 2/3] ipv4: add support for light weight tunnel encap attributes Date: Fri, 19 Jun 2015 15:55:23 +0100 Message-ID: <55842D5B.90608@brocade.com> References: <1434689355-4088-3-git-send-email-roopa@cumulusnetworks.com> <558424E8.5090806@cumulusnetworks.com> Mime-Version: 1.0 Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit Cc: , , , To: roopa , Julian Anastasov Return-path: Received: from mx0a-000f0801.pphosted.com ([67.231.144.122]:48261 "EHLO mx0a-000f0801.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752292AbbFSOzy (ORCPT ); Fri, 19 Jun 2015 10:55:54 -0400 In-Reply-To: <558424E8.5090806@cumulusnetworks.com> Sender: netdev-owner@vger.kernel.org List-ID: On 19/06/15 15:19, roopa wrote: > On 6/18/15, 11:59 PM, Julian Anastasov wrote: >> Hello, >> >> On Thu, 18 Jun 2015, Roopa Prabhu wrote: >> >>> @@ -366,6 +371,7 @@ static inline size_t fib_nlmsg_size(struct >>> fib_info *fi) >>> payload += nla_total_size((RTAX_MAX * nla_total_size(4))); >>> if (fi->fib_nhs) { >>> + size_t nh_encapsize = 0; >> Var not in #ifdef. Any warnings with CONFIG_LWTUNNEL=n? >> >>> /* Also handles the special case fib_nhs == 1 */ >>> /* each nexthop is packed in an attribute */ >>> @@ -374,8 +380,23 @@ static inline size_t fib_nlmsg_size(struct >>> fib_info *fi) >>> /* may contain flow and gateway attribute */ >>> nhsize += 2 * nla_total_size(4); >>> +#ifdef CONFIG_LWTUNNEL >>> + /* grab encap info */ >>> + for_nexthops(fi) { >>> + if (nh->nh_lwtstate) { >>> + /* RTA_ENCAP_TYPE */ >>> + nh_encapsize += lwtunnel_get_encap_size( >>> + nh->nh_lwtstate); >> New labels not in #ifdef: > Will check and fix all warnings with CONFIG_LWTUNNEL off >> >>> + >>> +err_inval: >>> + ret = -EINVAL; >>> + >>> +errout: >>> + return ret; >>> } >> Some other places may need changes: >> >> - nh_comp: there is logic that decides if same fib_info >> is reused from many fib nodes. There should be check >> if NH matches by nh_lwtstate. > > yes, i will add that. One other place - fib_nh_match. This is used when deleting a route to verify that any supplied rtnetlink properties match the route in the fib. Thanks, Rob