| Message ID | 52B253C2.8070407@huawei.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Thu, Dec 19, 2013 at 10:02:42AM +0800, Wang Weidong wrote: > In switch() had do return, and never use the 'return NULL'. The > 'break' after return or goto has no effect. Remove it. > > v2: make it more readable as suggested by Neil. > > Signed-off-by: Wang Weidong <wangweidong1@huawei.com> > --- > net/sctp/input.c | 13 ++----------- > 1 file changed, 2 insertions(+), 11 deletions(-) > > diff --git a/net/sctp/input.c b/net/sctp/input.c > index 042ec6c..476bc8d 100644 > --- a/net/sctp/input.c > +++ b/net/sctp/input.c > @@ -1119,19 +1119,10 @@ static struct sctp_association *__sctp_rcv_lookup_harder(struct net *net, > return NULL; > > /* If this is INIT/INIT-ACK look inside the chunk too. */ > - switch (ch->type) { > - case SCTP_CID_INIT: > - case SCTP_CID_INIT_ACK: > + if (ch->type == SCTP_CID_INIT || ch->type == SCTP_CID_INIT_ACK) > return __sctp_rcv_init_lookup(net, skb, laddr, transportp); > - break; > > - default: > - return __sctp_rcv_walk_lookup(net, skb, laddr, transportp); > - break; > - } > - > - > - return NULL; > + return __sctp_rcv_walk_lookup(net, skb, laddr, transportp); > } > > /* Lookup an association for an inbound skb. */ > -- > 1.7.12 > > > > Acked-by: Neil Horman <nhorman@tuxdriver.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Wang Weidong <wangweidong1@huawei.com> Date: Thu, 19 Dec 2013 10:02:42 +0800 > In switch() had do return, and never use the 'return NULL'. The > 'break' after return or goto has no effect. Remove it. > > v2: make it more readable as suggested by Neil. > > Signed-off-by: Wang Weidong <wangweidong1@huawei.com> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/sctp/input.c b/net/sctp/input.c index 042ec6c..476bc8d 100644 --- a/net/sctp/input.c +++ b/net/sctp/input.c @@ -1119,19 +1119,10 @@ static struct sctp_association *__sctp_rcv_lookup_harder(struct net *net, return NULL; /* If this is INIT/INIT-ACK look inside the chunk too. */ - switch (ch->type) { - case SCTP_CID_INIT: - case SCTP_CID_INIT_ACK: + if (ch->type == SCTP_CID_INIT || ch->type == SCTP_CID_INIT_ACK) return __sctp_rcv_init_lookup(net, skb, laddr, transportp); - break; - default: - return __sctp_rcv_walk_lookup(net, skb, laddr, transportp); - break; - } - - - return NULL; + return __sctp_rcv_walk_lookup(net, skb, laddr, transportp); } /* Lookup an association for an inbound skb. */
In switch() had do return, and never use the 'return NULL'. The 'break' after return or goto has no effect. Remove it. v2: make it more readable as suggested by Neil. Signed-off-by: Wang Weidong <wangweidong1@huawei.com> --- net/sctp/input.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)