diff options
author | Joe Perches <joe@perches.com> | 2011-07-01 05:43:13 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-07-01 19:11:16 -0400 |
commit | fddc5f3e9164858cd9264a17580f9fc5ad948458 (patch) | |
tree | 8ac3da6561b74851304164af6e295a80f61e7665 /net/x25/x25_in.c | |
parent | 89f0e4feafb64643b0f0aba9d89984362bac9739 (diff) |
x25: Reduce switch/case indent
Make the case labels the same indent as the switch.
git diff -w shows 80 column line reflowing.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/x25/x25_in.c')
-rw-r--r-- | net/x25/x25_in.c | 118 |
1 files changed, 59 insertions, 59 deletions
diff --git a/net/x25/x25_in.c b/net/x25/x25_in.c index 15de65f04719..0b073b51b183 100644 --- a/net/x25/x25_in.c +++ b/net/x25/x25_in.c | |||
@@ -94,55 +94,55 @@ static int x25_state1_machine(struct sock *sk, struct sk_buff *skb, int frametyp | |||
94 | struct x25_sock *x25 = x25_sk(sk); | 94 | struct x25_sock *x25 = x25_sk(sk); |
95 | 95 | ||
96 | switch (frametype) { | 96 | switch (frametype) { |
97 | case X25_CALL_ACCEPTED: { | 97 | case X25_CALL_ACCEPTED: { |
98 | 98 | ||
99 | x25_stop_timer(sk); | 99 | x25_stop_timer(sk); |
100 | x25->condition = 0x00; | 100 | x25->condition = 0x00; |
101 | x25->vs = 0; | 101 | x25->vs = 0; |
102 | x25->va = 0; | 102 | x25->va = 0; |
103 | x25->vr = 0; | 103 | x25->vr = 0; |
104 | x25->vl = 0; | 104 | x25->vl = 0; |
105 | x25->state = X25_STATE_3; | 105 | x25->state = X25_STATE_3; |
106 | sk->sk_state = TCP_ESTABLISHED; | 106 | sk->sk_state = TCP_ESTABLISHED; |
107 | /* | 107 | /* |
108 | * Parse the data in the frame. | 108 | * Parse the data in the frame. |
109 | */ | 109 | */ |
110 | skb_pull(skb, X25_STD_MIN_LEN); | 110 | skb_pull(skb, X25_STD_MIN_LEN); |
111 | 111 | ||
112 | len = x25_parse_address_block(skb, &source_addr, | 112 | len = x25_parse_address_block(skb, &source_addr, |
113 | &dest_addr); | 113 | &dest_addr); |
114 | if (len > 0) | 114 | if (len > 0) |
115 | skb_pull(skb, len); | 115 | skb_pull(skb, len); |
116 | else if (len < 0) | 116 | else if (len < 0) |
117 | goto out_clear; | 117 | goto out_clear; |
118 | 118 | ||
119 | len = x25_parse_facilities(skb, &x25->facilities, | 119 | len = x25_parse_facilities(skb, &x25->facilities, |
120 | &x25->dte_facilities, | 120 | &x25->dte_facilities, |
121 | &x25->vc_facil_mask); | 121 | &x25->vc_facil_mask); |
122 | if (len > 0) | 122 | if (len > 0) |
123 | skb_pull(skb, len); | 123 | skb_pull(skb, len); |
124 | else if (len < 0) | 124 | else if (len < 0) |
125 | goto out_clear; | 125 | goto out_clear; |
126 | /* | 126 | /* |
127 | * Copy any Call User Data. | 127 | * Copy any Call User Data. |
128 | */ | 128 | */ |
129 | if (skb->len > 0) { | 129 | if (skb->len > 0) { |
130 | skb_copy_from_linear_data(skb, | 130 | skb_copy_from_linear_data(skb, |
131 | x25->calluserdata.cuddata, | 131 | x25->calluserdata.cuddata, |
132 | skb->len); | 132 | skb->len); |
133 | x25->calluserdata.cudlength = skb->len; | 133 | x25->calluserdata.cudlength = skb->len; |
134 | } | ||
135 | if (!sock_flag(sk, SOCK_DEAD)) | ||
136 | sk->sk_state_change(sk); | ||
137 | break; | ||
138 | } | 134 | } |
139 | case X25_CLEAR_REQUEST: | 135 | if (!sock_flag(sk, SOCK_DEAD)) |
140 | x25_write_internal(sk, X25_CLEAR_CONFIRMATION); | 136 | sk->sk_state_change(sk); |
141 | x25_disconnect(sk, ECONNREFUSED, skb->data[3], skb->data[4]); | 137 | break; |
142 | break; | 138 | } |
139 | case X25_CLEAR_REQUEST: | ||
140 | x25_write_internal(sk, X25_CLEAR_CONFIRMATION); | ||
141 | x25_disconnect(sk, ECONNREFUSED, skb->data[3], skb->data[4]); | ||
142 | break; | ||
143 | 143 | ||
144 | default: | 144 | default: |
145 | break; | 145 | break; |
146 | } | 146 | } |
147 | 147 | ||
148 | return 0; | 148 | return 0; |
@@ -354,18 +354,18 @@ int x25_process_rx_frame(struct sock *sk, struct sk_buff *skb) | |||
354 | frametype = x25_decode(sk, skb, &ns, &nr, &q, &d, &m); | 354 | frametype = x25_decode(sk, skb, &ns, &nr, &q, &d, &m); |
355 | 355 | ||
356 | switch (x25->state) { | 356 | switch (x25->state) { |
357 | case X25_STATE_1: | 357 | case X25_STATE_1: |
358 | queued = x25_state1_machine(sk, skb, frametype); | 358 | queued = x25_state1_machine(sk, skb, frametype); |
359 | break; | 359 | break; |
360 | case X25_STATE_2: | 360 | case X25_STATE_2: |
361 | queued = x25_state2_machine(sk, skb, frametype); | 361 | queued = x25_state2_machine(sk, skb, frametype); |
362 | break; | 362 | break; |
363 | case X25_STATE_3: | 363 | case X25_STATE_3: |
364 | queued = x25_state3_machine(sk, skb, frametype, ns, nr, q, d, m); | 364 | queued = x25_state3_machine(sk, skb, frametype, ns, nr, q, d, m); |
365 | break; | 365 | break; |
366 | case X25_STATE_4: | 366 | case X25_STATE_4: |
367 | queued = x25_state4_machine(sk, skb, frametype); | 367 | queued = x25_state4_machine(sk, skb, frametype); |
368 | break; | 368 | break; |
369 | } | 369 | } |
370 | 370 | ||
371 | x25_kick(sk); | 371 | x25_kick(sk); |