diff options
author | Joe Perches <joe@perches.com> | 2011-07-01 05:43:03 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-07-01 19:11:15 -0400 |
commit | 06f8fe11bb4a84de9d9faa50c7ffbe40b90d395a (patch) | |
tree | 79c244cd97661156649b6af488c4827729da634e /net/decnet/dn_nsp_in.c | |
parent | 4a9e4b09326baa6db30ae35e3521bf5259b238f5 (diff) |
decnet: Reduce switch/case indent
Make the case labels the same indent as the switch.
git diff -w shows differences for line wrapping.
(fit multiple lines to 80 columns, join where possible)
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/decnet/dn_nsp_in.c')
-rw-r--r-- | net/decnet/dn_nsp_in.c | 182 |
1 files changed, 93 insertions, 89 deletions
diff --git a/net/decnet/dn_nsp_in.c b/net/decnet/dn_nsp_in.c index b430549e2b9..73fa268fe2e 100644 --- a/net/decnet/dn_nsp_in.c +++ b/net/decnet/dn_nsp_in.c | |||
@@ -101,23 +101,27 @@ static void dn_ack(struct sock *sk, struct sk_buff *skb, unsigned short ack) | |||
101 | unsigned short type = ((ack >> 12) & 0x0003); | 101 | unsigned short type = ((ack >> 12) & 0x0003); |
102 | int wakeup = 0; | 102 | int wakeup = 0; |
103 | 103 | ||
104 | switch(type) { | 104 | switch (type) { |
105 | case 0: /* ACK - Data */ | 105 | case 0: /* ACK - Data */ |
106 | if (dn_after(ack, scp->ackrcv_dat)) { | 106 | if (dn_after(ack, scp->ackrcv_dat)) { |
107 | scp->ackrcv_dat = ack & 0x0fff; | 107 | scp->ackrcv_dat = ack & 0x0fff; |
108 | wakeup |= dn_nsp_check_xmit_queue(sk, skb, &scp->data_xmit_queue, ack); | 108 | wakeup |= dn_nsp_check_xmit_queue(sk, skb, |
109 | } | 109 | &scp->data_xmit_queue, |
110 | break; | 110 | ack); |
111 | case 1: /* NAK - Data */ | 111 | } |
112 | break; | 112 | break; |
113 | case 2: /* ACK - OtherData */ | 113 | case 1: /* NAK - Data */ |
114 | if (dn_after(ack, scp->ackrcv_oth)) { | 114 | break; |
115 | scp->ackrcv_oth = ack & 0x0fff; | 115 | case 2: /* ACK - OtherData */ |
116 | wakeup |= dn_nsp_check_xmit_queue(sk, skb, &scp->other_xmit_queue, ack); | 116 | if (dn_after(ack, scp->ackrcv_oth)) { |
117 | } | 117 | scp->ackrcv_oth = ack & 0x0fff; |
118 | break; | 118 | wakeup |= dn_nsp_check_xmit_queue(sk, skb, |
119 | case 3: /* NAK - OtherData */ | 119 | &scp->other_xmit_queue, |
120 | break; | 120 | ack); |
121 | } | ||
122 | break; | ||
123 | case 3: /* NAK - OtherData */ | ||
124 | break; | ||
121 | } | 125 | } |
122 | 126 | ||
123 | if (wakeup && !sock_flag(sk, SOCK_DEAD)) | 127 | if (wakeup && !sock_flag(sk, SOCK_DEAD)) |
@@ -417,19 +421,19 @@ static void dn_nsp_disc_init(struct sock *sk, struct sk_buff *skb) | |||
417 | scp->addrrem = cb->src_port; | 421 | scp->addrrem = cb->src_port; |
418 | sk->sk_state = TCP_CLOSE; | 422 | sk->sk_state = TCP_CLOSE; |
419 | 423 | ||
420 | switch(scp->state) { | 424 | switch (scp->state) { |
421 | case DN_CI: | 425 | case DN_CI: |
422 | case DN_CD: | 426 | case DN_CD: |
423 | scp->state = DN_RJ; | 427 | scp->state = DN_RJ; |
424 | sk->sk_err = ECONNREFUSED; | 428 | sk->sk_err = ECONNREFUSED; |
425 | break; | 429 | break; |
426 | case DN_RUN: | 430 | case DN_RUN: |
427 | sk->sk_shutdown |= SHUTDOWN_MASK; | 431 | sk->sk_shutdown |= SHUTDOWN_MASK; |
428 | scp->state = DN_DN; | 432 | scp->state = DN_DN; |
429 | break; | 433 | break; |
430 | case DN_DI: | 434 | case DN_DI: |
431 | scp->state = DN_DIC; | 435 | scp->state = DN_DIC; |
432 | break; | 436 | break; |
433 | } | 437 | } |
434 | 438 | ||
435 | if (!sock_flag(sk, SOCK_DEAD)) { | 439 | if (!sock_flag(sk, SOCK_DEAD)) { |
@@ -470,23 +474,23 @@ static void dn_nsp_disc_conf(struct sock *sk, struct sk_buff *skb) | |||
470 | 474 | ||
471 | sk->sk_state = TCP_CLOSE; | 475 | sk->sk_state = TCP_CLOSE; |
472 | 476 | ||
473 | switch(scp->state) { | 477 | switch (scp->state) { |
474 | case DN_CI: | 478 | case DN_CI: |
475 | scp->state = DN_NR; | 479 | scp->state = DN_NR; |
476 | break; | 480 | break; |
477 | case DN_DR: | 481 | case DN_DR: |
478 | if (reason == NSP_REASON_DC) | 482 | if (reason == NSP_REASON_DC) |
479 | scp->state = DN_DRC; | 483 | scp->state = DN_DRC; |
480 | if (reason == NSP_REASON_NL) | 484 | if (reason == NSP_REASON_NL) |
481 | scp->state = DN_CN; | ||
482 | break; | ||
483 | case DN_DI: | ||
484 | scp->state = DN_DIC; | ||
485 | break; | ||
486 | case DN_RUN: | ||
487 | sk->sk_shutdown |= SHUTDOWN_MASK; | ||
488 | case DN_CC: | ||
489 | scp->state = DN_CN; | 485 | scp->state = DN_CN; |
486 | break; | ||
487 | case DN_DI: | ||
488 | scp->state = DN_DIC; | ||
489 | break; | ||
490 | case DN_RUN: | ||
491 | sk->sk_shutdown |= SHUTDOWN_MASK; | ||
492 | case DN_CC: | ||
493 | scp->state = DN_CN; | ||
490 | } | 494 | } |
491 | 495 | ||
492 | if (!sock_flag(sk, SOCK_DEAD)) { | 496 | if (!sock_flag(sk, SOCK_DEAD)) { |
@@ -692,16 +696,16 @@ static int dn_nsp_no_socket(struct sk_buff *skb, unsigned short reason) | |||
692 | goto out; | 696 | goto out; |
693 | 697 | ||
694 | if ((reason != NSP_REASON_OK) && ((cb->nsp_flags & 0x0c) == 0x08)) { | 698 | if ((reason != NSP_REASON_OK) && ((cb->nsp_flags & 0x0c) == 0x08)) { |
695 | switch(cb->nsp_flags & 0x70) { | 699 | switch (cb->nsp_flags & 0x70) { |
696 | case 0x10: | 700 | case 0x10: |
697 | case 0x60: /* (Retransmitted) Connect Init */ | 701 | case 0x60: /* (Retransmitted) Connect Init */ |
698 | dn_nsp_return_disc(skb, NSP_DISCINIT, reason); | 702 | dn_nsp_return_disc(skb, NSP_DISCINIT, reason); |
699 | ret = NET_RX_SUCCESS; | 703 | ret = NET_RX_SUCCESS; |
700 | break; | 704 | break; |
701 | case 0x20: /* Connect Confirm */ | 705 | case 0x20: /* Connect Confirm */ |
702 | dn_nsp_return_disc(skb, NSP_DISCCONF, reason); | 706 | dn_nsp_return_disc(skb, NSP_DISCCONF, reason); |
703 | ret = NET_RX_SUCCESS; | 707 | ret = NET_RX_SUCCESS; |
704 | break; | 708 | break; |
705 | } | 709 | } |
706 | } | 710 | } |
707 | 711 | ||
@@ -733,17 +737,17 @@ static int dn_nsp_rx_packet(struct sk_buff *skb) | |||
733 | * Filter out conninits and useless packet types | 737 | * Filter out conninits and useless packet types |
734 | */ | 738 | */ |
735 | if ((cb->nsp_flags & 0x0c) == 0x08) { | 739 | if ((cb->nsp_flags & 0x0c) == 0x08) { |
736 | switch(cb->nsp_flags & 0x70) { | 740 | switch (cb->nsp_flags & 0x70) { |
737 | case 0x00: /* NOP */ | 741 | case 0x00: /* NOP */ |
738 | case 0x70: /* Reserved */ | 742 | case 0x70: /* Reserved */ |
739 | case 0x50: /* Reserved, Phase II node init */ | 743 | case 0x50: /* Reserved, Phase II node init */ |
744 | goto free_out; | ||
745 | case 0x10: | ||
746 | case 0x60: | ||
747 | if (unlikely(cb->rt_flags & DN_RT_F_RTS)) | ||
740 | goto free_out; | 748 | goto free_out; |
741 | case 0x10: | 749 | sk = dn_find_listener(skb, &reason); |
742 | case 0x60: | 750 | goto got_it; |
743 | if (unlikely(cb->rt_flags & DN_RT_F_RTS)) | ||
744 | goto free_out; | ||
745 | sk = dn_find_listener(skb, &reason); | ||
746 | goto got_it; | ||
747 | } | 751 | } |
748 | } | 752 | } |
749 | 753 | ||
@@ -836,20 +840,20 @@ int dn_nsp_backlog_rcv(struct sock *sk, struct sk_buff *skb) | |||
836 | * Control packet. | 840 | * Control packet. |
837 | */ | 841 | */ |
838 | if ((cb->nsp_flags & 0x0c) == 0x08) { | 842 | if ((cb->nsp_flags & 0x0c) == 0x08) { |
839 | switch(cb->nsp_flags & 0x70) { | 843 | switch (cb->nsp_flags & 0x70) { |
840 | case 0x10: | 844 | case 0x10: |
841 | case 0x60: | 845 | case 0x60: |
842 | dn_nsp_conn_init(sk, skb); | 846 | dn_nsp_conn_init(sk, skb); |
843 | break; | 847 | break; |
844 | case 0x20: | 848 | case 0x20: |
845 | dn_nsp_conn_conf(sk, skb); | 849 | dn_nsp_conn_conf(sk, skb); |
846 | break; | 850 | break; |
847 | case 0x30: | 851 | case 0x30: |
848 | dn_nsp_disc_init(sk, skb); | 852 | dn_nsp_disc_init(sk, skb); |
849 | break; | 853 | break; |
850 | case 0x40: | 854 | case 0x40: |
851 | dn_nsp_disc_conf(sk, skb); | 855 | dn_nsp_disc_conf(sk, skb); |
852 | break; | 856 | break; |
853 | } | 857 | } |
854 | 858 | ||
855 | } else if (cb->nsp_flags == 0x24) { | 859 | } else if (cb->nsp_flags == 0x24) { |
@@ -890,15 +894,15 @@ int dn_nsp_backlog_rcv(struct sock *sk, struct sk_buff *skb) | |||
890 | if (scp->state != DN_RUN) | 894 | if (scp->state != DN_RUN) |
891 | goto free_out; | 895 | goto free_out; |
892 | 896 | ||
893 | switch(cb->nsp_flags) { | 897 | switch (cb->nsp_flags) { |
894 | case 0x10: /* LS */ | 898 | case 0x10: /* LS */ |
895 | dn_nsp_linkservice(sk, skb); | 899 | dn_nsp_linkservice(sk, skb); |
896 | break; | 900 | break; |
897 | case 0x30: /* OD */ | 901 | case 0x30: /* OD */ |
898 | dn_nsp_otherdata(sk, skb); | 902 | dn_nsp_otherdata(sk, skb); |
899 | break; | 903 | break; |
900 | default: | 904 | default: |
901 | dn_nsp_data(sk, skb); | 905 | dn_nsp_data(sk, skb); |
902 | } | 906 | } |
903 | 907 | ||
904 | } else { /* Ack, chuck it out here */ | 908 | } else { /* Ack, chuck it out here */ |