From: Xin Long <lucien.xin@gmail.com> To: network dev <netdev@vger.kernel.org>, linux-sctp@vger.kernel.org Cc: davem@davemloft.net, Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>, Vlad Yasevich <vyasevich@gmail.com>, daniel@iogearbox.net Subject: [PATCH net 1/2] sctp: reduce indent level in sctp_copy_local_addr_list Date: Fri, 19 Aug 2016 19:30:21 +0800 [thread overview] Message-ID: <4d3c7b176bc8d5c48807ed60d83793c9d02e3757.1471605833.git.lucien.xin@gmail.com> (raw) In-Reply-To: <cover.1471605833.git.lucien.xin@gmail.com> In-Reply-To: <cover.1471605833.git.lucien.xin@gmail.com> This patch is to reduce indent level by using continue when the addr is not allowed, and also drop end_copy by using break. Signed-off-by: Xin Long <lucien.xin@gmail.com> --- net/sctp/protocol.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index 7b523e3..da5d82b 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c @@ -205,26 +205,27 @@ int sctp_copy_local_addr_list(struct net *net, struct sctp_bind_addr *bp, list_for_each_entry_rcu(addr, &net->sctp.local_addr_list, list) { if (!addr->valid) continue; - if (sctp_in_scope(net, &addr->a, scope)) { - /* Now that the address is in scope, check to see if - * the address type is really supported by the local - * sock as well as the remote peer. - */ - if ((((AF_INET == addr->a.sa.sa_family) && - (copy_flags & SCTP_ADDR4_PEERSUPP))) || - (((AF_INET6 == addr->a.sa.sa_family) && - (copy_flags & SCTP_ADDR6_ALLOWED) && - (copy_flags & SCTP_ADDR6_PEERSUPP)))) { - error = sctp_add_bind_addr(bp, &addr->a, - sizeof(addr->a), - SCTP_ADDR_SRC, GFP_ATOMIC); - if (error) - goto end_copy; - } - } + if (!sctp_in_scope(net, &addr->a, scope)) + continue; + + /* Now that the address is in scope, check to see if + * the address type is really supported by the local + * sock as well as the remote peer. + */ + if (addr->a.sa.sa_family == AF_INET && + !(copy_flags & SCTP_ADDR4_PEERSUPP)) + continue; + if (addr->a.sa.sa_family == AF_INET6 && + (!(copy_flags & SCTP_ADDR6_ALLOWED) || + !(copy_flags & SCTP_ADDR6_PEERSUPP))) + continue; + + error = sctp_add_bind_addr(bp, &addr->a, sizeof(addr->a), + SCTP_ADDR_SRC, GFP_ATOMIC); + if (error) + break; } -end_copy: rcu_read_unlock(); return error; } -- 2.1.0
WARNING: multiple messages have this Message-ID (diff)
From: Xin Long <lucien.xin@gmail.com> To: network dev <netdev@vger.kernel.org>, linux-sctp@vger.kernel.org Cc: davem@davemloft.net, Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>, Vlad Yasevich <vyasevich@gmail.com>, daniel@iogearbox.net Subject: [PATCH net 1/2] sctp: reduce indent level in sctp_copy_local_addr_list Date: Fri, 19 Aug 2016 11:30:21 +0000 [thread overview] Message-ID: <4d3c7b176bc8d5c48807ed60d83793c9d02e3757.1471605833.git.lucien.xin@gmail.com> (raw) In-Reply-To: <cover.1471605833.git.lucien.xin@gmail.com> This patch is to reduce indent level by using continue when the addr is not allowed, and also drop end_copy by using break. Signed-off-by: Xin Long <lucien.xin@gmail.com> --- net/sctp/protocol.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index 7b523e3..da5d82b 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c @@ -205,26 +205,27 @@ int sctp_copy_local_addr_list(struct net *net, struct sctp_bind_addr *bp, list_for_each_entry_rcu(addr, &net->sctp.local_addr_list, list) { if (!addr->valid) continue; - if (sctp_in_scope(net, &addr->a, scope)) { - /* Now that the address is in scope, check to see if - * the address type is really supported by the local - * sock as well as the remote peer. - */ - if ((((AF_INET = addr->a.sa.sa_family) && - (copy_flags & SCTP_ADDR4_PEERSUPP))) || - (((AF_INET6 = addr->a.sa.sa_family) && - (copy_flags & SCTP_ADDR6_ALLOWED) && - (copy_flags & SCTP_ADDR6_PEERSUPP)))) { - error = sctp_add_bind_addr(bp, &addr->a, - sizeof(addr->a), - SCTP_ADDR_SRC, GFP_ATOMIC); - if (error) - goto end_copy; - } - } + if (!sctp_in_scope(net, &addr->a, scope)) + continue; + + /* Now that the address is in scope, check to see if + * the address type is really supported by the local + * sock as well as the remote peer. + */ + if (addr->a.sa.sa_family = AF_INET && + !(copy_flags & SCTP_ADDR4_PEERSUPP)) + continue; + if (addr->a.sa.sa_family = AF_INET6 && + (!(copy_flags & SCTP_ADDR6_ALLOWED) || + !(copy_flags & SCTP_ADDR6_PEERSUPP))) + continue; + + error = sctp_add_bind_addr(bp, &addr->a, sizeof(addr->a), + SCTP_ADDR_SRC, GFP_ATOMIC); + if (error) + break; } -end_copy: rcu_read_unlock(); return error; } -- 2.1.0
next prev parent reply other threads:[~2016-08-19 13:35 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-08-19 11:30 [PATCH net 0/2] sctp: not copying duplicate addrs to the assoc's bind address list Xin Long 2016-08-19 11:30 ` Xin Long 2016-08-19 11:30 ` Xin Long [this message] 2016-08-19 11:30 ` [PATCH net 1/2] sctp: reduce indent level in sctp_copy_local_addr_list Xin Long 2016-08-19 11:30 ` [PATCH net 2/2] sctp: not copying duplicate addrs to the assoc's bind address list Xin Long 2016-08-19 11:30 ` Xin Long 2016-08-19 13:30 ` Neil Horman 2016-08-19 13:30 ` Neil Horman 2016-08-19 15:16 ` Xin Long 2016-08-19 15:16 ` Xin Long 2016-08-19 17:50 ` Neil Horman 2016-08-19 17:50 ` Neil Horman 2016-08-20 6:41 ` Xin Long 2016-08-20 6:41 ` Xin Long 2016-08-22 14:25 ` Neil Horman 2016-08-22 14:25 ` Neil Horman 2016-08-24 5:14 ` Xin Long 2016-08-24 5:14 ` Xin Long 2016-08-24 10:38 ` Neil Horman 2016-08-24 10:38 ` Neil Horman 2016-12-17 9:56 ` Xin Long 2016-12-17 9:56 ` Xin Long 2016-12-19 12:35 ` Neil Horman 2016-12-19 12:35 ` Neil Horman 2016-08-24 11:23 ` Marcelo Ricardo Leitner 2016-08-24 11:23 ` Marcelo Ricardo Leitner 2016-08-25 4:03 ` Xin Long 2016-08-25 4:03 ` Xin Long 2016-08-25 12:10 ` Marcelo Ricardo Leitner 2016-08-25 12:10 ` Marcelo Ricardo Leitner 2016-09-02 13:22 ` David Laight 2016-09-02 13:22 ` David Laight 2016-09-02 13:46 ` Marcelo Ricardo Leitner 2016-09-02 13:46 ` Marcelo Ricardo Leitner 2016-09-02 14:25 ` David Laight 2016-09-02 14:25 ` David Laight 2016-09-02 14:44 ` 'Marcelo Ricardo Leitner' 2016-09-02 14:44 ` 'Marcelo Ricardo Leitner'
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=4d3c7b176bc8d5c48807ed60d83793c9d02e3757.1471605833.git.lucien.xin@gmail.com \ --to=lucien.xin@gmail.com \ --cc=daniel@iogearbox.net \ --cc=davem@davemloft.net \ --cc=linux-sctp@vger.kernel.org \ --cc=marcelo.leitner@gmail.com \ --cc=netdev@vger.kernel.org \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.