From: Wang Weidong <wangweidong1@huawei.com>
To: <nhorman@tuxdriver.com>, <vyasevich@gmail.com>
Cc: <davem@davemloft.net>, <dingtianhong@huawei.com>,
<linux-sctp@vger.kernel.org>, <netdev@vger.kernel.org>
Subject: [PATCH net-next 1/4] sctp: merge two if statements to one
Date: Fri, 25 Oct 2013 11:45:45 +0800 [thread overview]
Message-ID: <1382672748-10156-2-git-send-email-wangweidong1@huawei.com> (raw)
In-Reply-To: <1382672748-10156-1-git-send-email-wangweidong1@huawei.com>
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 <wangweidong1@huawei.com>
---
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) {
id = 0;
continue;
}
--
1.7.12
next prev parent reply other threads:[~2013-10-25 3:48 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-25 3:45 [PATCH net-next 0/4] sctp: do some clean up and fix comments Wang Weidong
2013-10-25 3:45 ` Wang Weidong [this message]
2013-10-25 3:45 ` [PATCH net-next 2/4] sctp: remove the repeat initialize with 0 Wang Weidong
2013-10-25 3:45 ` [PATCH net-next 3/4] sctp: fix some comments in associola.c Wang Weidong
2013-10-25 3:45 ` [PATCH net-next 4/4] sctp: fix comment in chunk.c Wang Weidong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1382672748-10156-2-git-send-email-wangweidong1@huawei.com \
--to=wangweidong1@huawei.com \
--cc=davem@davemloft.net \
--cc=dingtianhong@huawei.com \
--cc=linux-sctp@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nhorman@tuxdriver.com \
--cc=vyasevich@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox