aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwangweidong <wangweidong1@huawei.com>2013-12-22 23:16:53 -0500
committerDavid S. Miller <davem@davemloft.net>2013-12-26 13:47:48 -0500
commit8d72651d86e9c702d37dd9ef9f084ce027af90a7 (patch)
tree7e5406d0de3cdc025e2c892bd7addb3e54732959
parentf7010e61442c80333b38aa026a551043a341fb8d (diff)
sctp: fix checkpatch errors with open brace '{' and trailing statements
fix checkpatch errors below: ERROR: that open brace { should be on the previous line ERROR: open brace '{' following function declarations go on the next line ERROR: trailing statements should be on next line Signed-off-by: Wang Weidong <wangweidong1@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/sctp/auth.c3
-rw-r--r--net/sctp/input.c6
-rw-r--r--net/sctp/protocol.c4
-rw-r--r--net/sctp/socket.c3
-rw-r--r--net/sctp/ulpqueue.c3
5 files changed, 9 insertions, 10 deletions
diff --git a/net/sctp/auth.c b/net/sctp/auth.c
index a594b3ca5834..683c7d1b1306 100644
--- a/net/sctp/auth.c
+++ b/net/sctp/auth.c
@@ -499,8 +499,7 @@ void sctp_auth_destroy_hmacs(struct crypto_hash *auth_hmacs[])
499 if (!auth_hmacs) 499 if (!auth_hmacs)
500 return; 500 return;
501 501
502 for (i = 0; i < SCTP_AUTH_NUM_HMACS; i++) 502 for (i = 0; i < SCTP_AUTH_NUM_HMACS; i++) {
503 {
504 if (auth_hmacs[i]) 503 if (auth_hmacs[i])
505 crypto_free_hash(auth_hmacs[i]); 504 crypto_free_hash(auth_hmacs[i]);
506 } 505 }
diff --git a/net/sctp/input.c b/net/sctp/input.c
index b67e3d83b48a..1f4eeb43fbd6 100644
--- a/net/sctp/input.c
+++ b/net/sctp/input.c
@@ -180,8 +180,7 @@ int sctp_rcv(struct sk_buff *skb)
180 * If a frame arrives on an interface and the receiving socket is 180 * If a frame arrives on an interface and the receiving socket is
181 * bound to another interface, via SO_BINDTODEVICE, treat it as OOTB 181 * bound to another interface, via SO_BINDTODEVICE, treat it as OOTB
182 */ 182 */
183 if (sk->sk_bound_dev_if && (sk->sk_bound_dev_if != af->skb_iif(skb))) 183 if (sk->sk_bound_dev_if && (sk->sk_bound_dev_if != af->skb_iif(skb))) {
184 {
185 if (asoc) { 184 if (asoc) {
186 sctp_association_put(asoc); 185 sctp_association_put(asoc);
187 asoc = NULL; 186 asoc = NULL;
@@ -610,8 +609,7 @@ void sctp_v4_err(struct sk_buff *skb, __u32 info)
610 if (ICMP_FRAG_NEEDED == code) { 609 if (ICMP_FRAG_NEEDED == code) {
611 sctp_icmp_frag_needed(sk, asoc, transport, info); 610 sctp_icmp_frag_needed(sk, asoc, transport, info);
612 goto out_unlock; 611 goto out_unlock;
613 } 612 } else {
614 else {
615 if (ICMP_PROT_UNREACH == code) { 613 if (ICMP_PROT_UNREACH == code) {
616 sctp_icmp_proto_unreachable(sk, asoc, 614 sctp_icmp_proto_unreachable(sk, asoc,
617 transport); 615 transport);
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index 19bd4c5bdae9..34b7726bcd7f 100644
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -1065,8 +1065,8 @@ static struct sctp_af sctp_af_inet = {
1065#endif 1065#endif
1066}; 1066};
1067 1067
1068struct sctp_pf *sctp_get_pf_specific(sa_family_t family) { 1068struct sctp_pf *sctp_get_pf_specific(sa_family_t family)
1069 1069{
1070 switch (family) { 1070 switch (family) {
1071 case PF_INET: 1071 case PF_INET:
1072 return sctp_pf_inet_specific; 1072 return sctp_pf_inet_specific;
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 9f42c605bfa8..2df55647d4ab 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -5443,7 +5443,8 @@ static int sctp_getsockopt_peer_auth_chunks(struct sock *sk, int len,
5443 return -EFAULT; 5443 return -EFAULT;
5444num: 5444num:
5445 len = sizeof(struct sctp_authchunks) + num_chunks; 5445 len = sizeof(struct sctp_authchunks) + num_chunks;
5446 if (put_user(len, optlen)) return -EFAULT; 5446 if (put_user(len, optlen))
5447 return -EFAULT;
5447 if (put_user(num_chunks, &p->gauth_number_of_chunks)) 5448 if (put_user(num_chunks, &p->gauth_number_of_chunks))
5448 return -EFAULT; 5449 return -EFAULT;
5449 return 0; 5450 return 0;
diff --git a/net/sctp/ulpqueue.c b/net/sctp/ulpqueue.c
index c700369d11f7..5dc94117e9d4 100644
--- a/net/sctp/ulpqueue.c
+++ b/net/sctp/ulpqueue.c
@@ -336,7 +336,8 @@ static struct sctp_ulpevent *sctp_make_reassembled_event(struct net *net,
336 pos = f_frag->next; 336 pos = f_frag->next;
337 337
338 /* Get the last skb in the f_frag's frag_list if present. */ 338 /* Get the last skb in the f_frag's frag_list if present. */
339 for (last = list; list; last = list, list = list->next); 339 for (last = list; list; last = list, list = list->next)
340 ;
340 341
341 /* Add the list of remaining fragments to the first fragments 342 /* Add the list of remaining fragments to the first fragments
342 * frag_list. 343 * frag_list.