From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vlad Yasevich Subject: Re: [PATCH 1/4] sctp: merge two if statements to one Date: Fri, 25 Oct 2013 19:40:29 -0400 Message-ID: <526B016D.6030301@gmail.com> References: <1382665805-13952-1-git-send-email-wangweidong1@huawei.com> <1382665805-13952-2-git-send-email-wangweidong1@huawei.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: dingtianhong@huawei.com, linux-sctp@vger.kernel.org, netdev@vger.kernel.org To: Wang Weidong , davem@davemloft.net, nhorman@tuxdriver.com Return-path: Received: from mail-we0-f177.google.com ([74.125.82.177]:61197 "EHLO mail-we0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753603Ab3JYXku (ORCPT ); Fri, 25 Oct 2013 19:40:50 -0400 In-Reply-To: <1382665805-13952-2-git-send-email-wangweidong1@huawei.com> Sender: netdev-owner@vger.kernel.org List-ID: On 10/24/2013 09:50 PM, Wang Weidong wrote: > Two if statements do the same work, maybe we can merge them to > one. There is just code simplification, no functional changes. > > Signed-off-by: Wang Weidong > --- > net/sctp/auth.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/net/sctp/auth.c b/net/sctp/auth.c > index 8c4fa5d..19fb0ae 100644 > --- a/net/sctp/auth.c > +++ b/net/sctp/auth.c > @@ -539,18 +539,14 @@ struct sctp_hmac *sctp_auth_asoc_get_hmac(const struct sctp_association *asoc) > for (i = 0; i < n_elt; i++) { > id = ntohs(hmacs->hmac_ids[i]); > > - /* Check the id is in the supported range */ > - if (id > SCTP_AUTH_HMAC_ID_MAX) { > - id = 0; > - continue; > - } > - > - /* See is we support the id. Supported IDs have name and > + /* Check the id is in the supported range. And > + * see is we support the id. Supported IDs have name and > * length fields set, so that we can allocated and use > * them. We can safely just check for name, for without the > * name, we can't allocate the TFM. > */ > - if (!sctp_hmac_list[id].hmac_name) { > + if (id > SCTP_AUTH_HMAC_ID_MAX || > + !sctp_hmac_list[id].hmac_name) { Can you please make the 2 parts of the 'if' statement above line up with each other instead of the code below. I makes it easy to see what the whole 'if conditional' is. Thanks -vlad > id = 0; > continue; > } >