From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jiri Pirko Subject: Re: [patch net-next 00/15] mlxsw: Reflect nexthop status changes Date: Wed, 8 Feb 2017 21:58:35 +0100 Message-ID: <20170208205835.GC20719@nanopsycho> References: <1486549002-2056-1-git-send-email-jiri@resnulli.us> <20170208.152848.118275722298964427.davem@davemloft.net> <20170208.154345.288561019647245358.davem@davemloft.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: netdev@vger.kernel.org, idosch@mellanox.com, eladr@mellanox.com, mlxsw@mellanox.com To: David Miller Return-path: Received: from mail-wm0-f67.google.com ([74.125.82.67]:35066 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750990AbdBHU6j (ORCPT ); Wed, 8 Feb 2017 15:58:39 -0500 Received: by mail-wm0-f67.google.com with SMTP id u63so81900wmu.2 for ; Wed, 08 Feb 2017 12:58:38 -0800 (PST) Content-Disposition: inline In-Reply-To: <20170208.154345.288561019647245358.davem@davemloft.net> Sender: netdev-owner@vger.kernel.org List-ID: Wed, Feb 08, 2017 at 09:43:45PM CET, davem@davemloft.net wrote: >From: David Miller >Date: Wed, 08 Feb 2017 15:28:48 -0500 (EST) > >> Looks really nice, series applied, thanks! > >Jiri, just FYI, I bungled up merging this. And I am trying to fix >that up. > >I forgot to include patch #14, but I'll apply that now in the >mainline. Yeah, the lost patch #14. I had to resend it to get it to patchwork. That's probably what confused your tools. > >I get a warning, in mlxsw_sp_nexthop_group_create() because the >compiler thinks that 'nh' can be use uninitialized. And I think >the compiler is pointing out something legitimate. > >This cleanup loop in err_nexthop_group_insert and err_nexthop_init >needs to take the 'nh' from &nh_grp->nexthops[i] instead of using >whatever is left in 'nh' for all mlxsw_sp_nexthop_fini() calls. > >So I'm going to augment the commit of patch #14 to make it go: > >@@ -1667,8 +1667,10 @@ mlxsw_sp_nexthop_group_create(struct mlxsw_sp *mlxsw_sp, struct fib_info *fi) > > err_nexthop_group_insert: > err_nexthop_init: >- for (i--; i >= 0; i--) >+ for (i--; i >= 0; i--) { >+ nh = &nh_grp->nexthops[i]; > mlxsw_sp_nexthop_fini(mlxsw_sp, nh); >+ } > kfree(nh_grp); > return ERR_PTR(err); > } Oh. I did not catch is. But this is totally unrelated to this patchset. Please send it as a separate fix. Or I can do it if yo want. Fixes: a7ff87acd995 ("mlxsw: spectrum_router: Implement next-hop routing") Acked-by: Jiri Pirko