From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andreas Schultz Subject: Re: [PATCH net-next v2 3/6] gtp: unify genl_find_pdp and prepare for per socket lookup Date: Thu, 2 Feb 2017 15:27:17 +0100 (CET) Message-ID: <1732401345.730492.1486045637611.JavaMail.zimbra@tpip.net> References: <20170130163713.17524-1-aschultz@tpip.net> <20170130163713.17524-4-aschultz@tpip.net> <20170202141951.GA3883@salvia> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: netdev , laforge , Lionel Gauthier , openbsc To: pablo Return-path: Received: from mail.tpip.net ([92.43.49.48]:50333 "EHLO mail.tpip.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751349AbdBBO1U (ORCPT ); Thu, 2 Feb 2017 09:27:20 -0500 In-Reply-To: <20170202141951.GA3883@salvia> Sender: netdev-owner@vger.kernel.org List-ID: ----- On Feb 2, 2017, at 3:19 PM, pablo pablo@netfilter.org wrote: > On Mon, Jan 30, 2017 at 05:37:10PM +0100, Andreas Schultz wrote: >> This unifies duplicate code into a helper. It also prepares the >> groundwork to add a lookup version that uses the socket to find >> attache pdp contexts. >> >> Signed-off-by: Andreas Schultz >> --- >> drivers/net/gtp.c | 120 +++++++++++++++++++++++------------------------------- >> 1 file changed, 51 insertions(+), 69 deletions(-) >> >> diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c >> index c96c71f..6b7a3c2 100644 >> --- a/drivers/net/gtp.c >> +++ b/drivers/net/gtp.c > [...] >> +static struct pdp_ctx *gtp_genl_find_pdp(struct sk_buff *skb, >> + struct genl_info *info) >> +{ >> + struct pdp_ctx *pctx; >> + >> + if (info->attrs[GTPA_LINK]) >> + pctx = gtp_genl_find_pdp_by_link(skb, info); >> + else >> + pctx = ERR_PTR(-EINVAL); >> + if (!pctx) >> + pctx = ERR_PTR(-ENOENT); >> + >> + return pctx; >> +} > > For gtp_genl_find_pdp(), I think this is easier to read: > > if (!info->attrs[GTPA_LINK]) > return ERR_PTR(-EINVAL); > > pctx = gtp_genl_find_pdp_by_link(skb, info); > if (!pctx) > return ERR_PTR(-ENOENT); > > return pctx; Yes, but a later patch (will be submitted after this series is accepted) will change that to: if (info->attrs[GTPA_LINK]) pctx = gtp_genl_find_pdp_by_link(skb, info); else if (info->attrs[GTPA_FD]) pctx = gtp_genl_find_pdp_by_socket(skb, info); else pctx = ERR_PTR(-EINVAL); if (!pctx) pctx = ERR_PTR(-ENOENT); return pctx; I can use your form for this change, but have a larger change later. Which way do you prefer it? Andreas