tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

lapb: Reduce switch/case indent

Make the case labels the same indent as the switch.

git diff -w shows 80 column reflowing.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Joe Perches and committed by
David S. Miller fcb261f3 207ec0ab

+511 -534
+14 -14
net/lapb/lapb_iface.c
··· 300 300 goto out; 301 301 302 302 switch (lapb->state) { 303 - case LAPB_STATE_0: 304 - rc = LAPB_NOTCONNECTED; 305 - goto out_put; 303 + case LAPB_STATE_0: 304 + rc = LAPB_NOTCONNECTED; 305 + goto out_put; 306 306 307 - case LAPB_STATE_1: 307 + case LAPB_STATE_1: 308 308 #if LAPB_DEBUG > 1 309 - printk(KERN_DEBUG "lapb: (%p) S1 TX DISC(1)\n", lapb->dev); 309 + printk(KERN_DEBUG "lapb: (%p) S1 TX DISC(1)\n", lapb->dev); 310 310 #endif 311 311 #if LAPB_DEBUG > 0 312 - printk(KERN_DEBUG "lapb: (%p) S1 -> S0\n", lapb->dev); 312 + printk(KERN_DEBUG "lapb: (%p) S1 -> S0\n", lapb->dev); 313 313 #endif 314 - lapb_send_control(lapb, LAPB_DISC, LAPB_POLLON, LAPB_COMMAND); 315 - lapb->state = LAPB_STATE_0; 316 - lapb_start_t1timer(lapb); 317 - rc = LAPB_NOTCONNECTED; 318 - goto out_put; 314 + lapb_send_control(lapb, LAPB_DISC, LAPB_POLLON, LAPB_COMMAND); 315 + lapb->state = LAPB_STATE_0; 316 + lapb_start_t1timer(lapb); 317 + rc = LAPB_NOTCONNECTED; 318 + goto out_put; 319 319 320 - case LAPB_STATE_2: 321 - rc = LAPB_OK; 322 - goto out_put; 320 + case LAPB_STATE_2: 321 + rc = LAPB_OK; 322 + goto out_put; 323 323 } 324 324 325 325 lapb_clear_queues(lapb);
+497 -520
net/lapb/lapb_in.c
··· 44 44 struct lapb_frame *frame) 45 45 { 46 46 switch (frame->type) { 47 - case LAPB_SABM: 47 + case LAPB_SABM: 48 48 #if LAPB_DEBUG > 1 49 - printk(KERN_DEBUG "lapb: (%p) S0 RX SABM(%d)\n", 49 + printk(KERN_DEBUG "lapb: (%p) S0 RX SABM(%d)\n", 50 + lapb->dev, frame->pf); 51 + #endif 52 + if (lapb->mode & LAPB_EXTENDED) { 53 + #if LAPB_DEBUG > 1 54 + printk(KERN_DEBUG "lapb: (%p) S0 TX DM(%d)\n", 50 55 lapb->dev, frame->pf); 51 56 #endif 52 - if (lapb->mode & LAPB_EXTENDED) { 57 + lapb_send_control(lapb, LAPB_DM, frame->pf, 58 + LAPB_RESPONSE); 59 + } else { 53 60 #if LAPB_DEBUG > 1 54 - printk(KERN_DEBUG "lapb: (%p) S0 TX DM(%d)\n", 55 - lapb->dev, frame->pf); 56 - #endif 57 - lapb_send_control(lapb, LAPB_DM, frame->pf, 58 - LAPB_RESPONSE); 59 - } else { 60 - #if LAPB_DEBUG > 1 61 - printk(KERN_DEBUG "lapb: (%p) S0 TX UA(%d)\n", 62 - lapb->dev, frame->pf); 63 - #endif 64 - #if LAPB_DEBUG > 0 65 - printk(KERN_DEBUG "lapb: (%p) S0 -> S3\n", 66 - lapb->dev); 67 - #endif 68 - lapb_send_control(lapb, LAPB_UA, frame->pf, 69 - LAPB_RESPONSE); 70 - lapb_stop_t1timer(lapb); 71 - lapb_stop_t2timer(lapb); 72 - lapb->state = LAPB_STATE_3; 73 - lapb->condition = 0x00; 74 - lapb->n2count = 0; 75 - lapb->vs = 0; 76 - lapb->vr = 0; 77 - lapb->va = 0; 78 - lapb_connect_indication(lapb, LAPB_OK); 79 - } 80 - break; 81 - 82 - case LAPB_SABME: 83 - #if LAPB_DEBUG > 1 84 - printk(KERN_DEBUG "lapb: (%p) S0 RX SABME(%d)\n", 85 - lapb->dev, frame->pf); 86 - #endif 87 - if (lapb->mode & LAPB_EXTENDED) { 88 - #if LAPB_DEBUG > 1 89 - printk(KERN_DEBUG "lapb: (%p) S0 TX UA(%d)\n", 90 - lapb->dev, frame->pf); 91 - #endif 92 - #if LAPB_DEBUG > 0 93 - printk(KERN_DEBUG "lapb: (%p) S0 -> S3\n", 94 - lapb->dev); 95 - #endif 96 - lapb_send_control(lapb, LAPB_UA, frame->pf, 97 - LAPB_RESPONSE); 98 - lapb_stop_t1timer(lapb); 99 - lapb_stop_t2timer(lapb); 100 - lapb->state = LAPB_STATE_3; 101 - lapb->condition = 0x00; 102 - lapb->n2count = 0; 103 - lapb->vs = 0; 104 - lapb->vr = 0; 105 - lapb->va = 0; 106 - lapb_connect_indication(lapb, LAPB_OK); 107 - } else { 108 - #if LAPB_DEBUG > 1 109 - printk(KERN_DEBUG "lapb: (%p) S0 TX DM(%d)\n", 110 - lapb->dev, frame->pf); 111 - #endif 112 - lapb_send_control(lapb, LAPB_DM, frame->pf, 113 - LAPB_RESPONSE); 114 - } 115 - break; 116 - 117 - case LAPB_DISC: 118 - #if LAPB_DEBUG > 1 119 - printk(KERN_DEBUG "lapb: (%p) S0 RX DISC(%d)\n", 120 - lapb->dev, frame->pf); 121 61 printk(KERN_DEBUG "lapb: (%p) S0 TX UA(%d)\n", 122 62 lapb->dev, frame->pf); 123 63 #endif 64 + #if LAPB_DEBUG > 0 65 + printk(KERN_DEBUG "lapb: (%p) S0 -> S3\n", lapb->dev); 66 + #endif 124 67 lapb_send_control(lapb, LAPB_UA, frame->pf, 125 68 LAPB_RESPONSE); 126 - break; 69 + lapb_stop_t1timer(lapb); 70 + lapb_stop_t2timer(lapb); 71 + lapb->state = LAPB_STATE_3; 72 + lapb->condition = 0x00; 73 + lapb->n2count = 0; 74 + lapb->vs = 0; 75 + lapb->vr = 0; 76 + lapb->va = 0; 77 + lapb_connect_indication(lapb, LAPB_OK); 78 + } 79 + break; 127 80 128 - default: 129 - break; 81 + case LAPB_SABME: 82 + #if LAPB_DEBUG > 1 83 + printk(KERN_DEBUG "lapb: (%p) S0 RX SABME(%d)\n", 84 + lapb->dev, frame->pf); 85 + #endif 86 + if (lapb->mode & LAPB_EXTENDED) { 87 + #if LAPB_DEBUG > 1 88 + printk(KERN_DEBUG "lapb: (%p) S0 TX UA(%d)\n", 89 + lapb->dev, frame->pf); 90 + #endif 91 + #if LAPB_DEBUG > 0 92 + printk(KERN_DEBUG "lapb: (%p) S0 -> S3\n", lapb->dev); 93 + #endif 94 + lapb_send_control(lapb, LAPB_UA, frame->pf, 95 + LAPB_RESPONSE); 96 + lapb_stop_t1timer(lapb); 97 + lapb_stop_t2timer(lapb); 98 + lapb->state = LAPB_STATE_3; 99 + lapb->condition = 0x00; 100 + lapb->n2count = 0; 101 + lapb->vs = 0; 102 + lapb->vr = 0; 103 + lapb->va = 0; 104 + lapb_connect_indication(lapb, LAPB_OK); 105 + } else { 106 + #if LAPB_DEBUG > 1 107 + printk(KERN_DEBUG "lapb: (%p) S0 TX DM(%d)\n", 108 + lapb->dev, frame->pf); 109 + #endif 110 + lapb_send_control(lapb, LAPB_DM, frame->pf, 111 + LAPB_RESPONSE); 112 + } 113 + break; 114 + 115 + case LAPB_DISC: 116 + #if LAPB_DEBUG > 1 117 + printk(KERN_DEBUG "lapb: (%p) S0 RX DISC(%d)\n", 118 + lapb->dev, frame->pf); 119 + printk(KERN_DEBUG "lapb: (%p) S0 TX UA(%d)\n", 120 + lapb->dev, frame->pf); 121 + #endif 122 + lapb_send_control(lapb, LAPB_UA, frame->pf, LAPB_RESPONSE); 123 + break; 124 + 125 + default: 126 + break; 130 127 } 131 128 132 129 kfree_skb(skb); ··· 137 140 struct lapb_frame *frame) 138 141 { 139 142 switch (frame->type) { 140 - case LAPB_SABM: 143 + case LAPB_SABM: 141 144 #if LAPB_DEBUG > 1 142 - printk(KERN_DEBUG "lapb: (%p) S1 RX SABM(%d)\n", 143 - lapb->dev, frame->pf); 145 + printk(KERN_DEBUG "lapb: (%p) S1 RX SABM(%d)\n", 146 + lapb->dev, frame->pf); 144 147 #endif 145 - if (lapb->mode & LAPB_EXTENDED) { 148 + if (lapb->mode & LAPB_EXTENDED) { 146 149 #if LAPB_DEBUG > 1 147 - printk(KERN_DEBUG "lapb: (%p) S1 TX DM(%d)\n", 148 - lapb->dev, frame->pf); 149 - #endif 150 - lapb_send_control(lapb, LAPB_DM, frame->pf, 151 - LAPB_RESPONSE); 152 - } else { 153 - #if LAPB_DEBUG > 1 154 - printk(KERN_DEBUG "lapb: (%p) S1 TX UA(%d)\n", 155 - lapb->dev, frame->pf); 156 - #endif 157 - lapb_send_control(lapb, LAPB_UA, frame->pf, 158 - LAPB_RESPONSE); 159 - } 160 - break; 161 - 162 - case LAPB_SABME: 163 - #if LAPB_DEBUG > 1 164 - printk(KERN_DEBUG "lapb: (%p) S1 RX SABME(%d)\n", 165 - lapb->dev, frame->pf); 166 - #endif 167 - if (lapb->mode & LAPB_EXTENDED) { 168 - #if LAPB_DEBUG > 1 169 - printk(KERN_DEBUG "lapb: (%p) S1 TX UA(%d)\n", 170 - lapb->dev, frame->pf); 171 - #endif 172 - lapb_send_control(lapb, LAPB_UA, frame->pf, 173 - LAPB_RESPONSE); 174 - } else { 175 - #if LAPB_DEBUG > 1 176 - printk(KERN_DEBUG "lapb: (%p) S1 TX DM(%d)\n", 177 - lapb->dev, frame->pf); 178 - #endif 179 - lapb_send_control(lapb, LAPB_DM, frame->pf, 180 - LAPB_RESPONSE); 181 - } 182 - break; 183 - 184 - case LAPB_DISC: 185 - #if LAPB_DEBUG > 1 186 - printk(KERN_DEBUG "lapb: (%p) S1 RX DISC(%d)\n", 187 - lapb->dev, frame->pf); 188 150 printk(KERN_DEBUG "lapb: (%p) S1 TX DM(%d)\n", 189 151 lapb->dev, frame->pf); 190 152 #endif 191 153 lapb_send_control(lapb, LAPB_DM, frame->pf, 192 154 LAPB_RESPONSE); 193 - break; 194 - 195 - case LAPB_UA: 155 + } else { 196 156 #if LAPB_DEBUG > 1 197 - printk(KERN_DEBUG "lapb: (%p) S1 RX UA(%d)\n", 157 + printk(KERN_DEBUG "lapb: (%p) S1 TX UA(%d)\n", 198 158 lapb->dev, frame->pf); 199 159 #endif 200 - if (frame->pf) { 201 - #if LAPB_DEBUG > 0 202 - printk(KERN_DEBUG "lapb: (%p) S1 -> S3\n", 203 - lapb->dev); 204 - #endif 205 - lapb_stop_t1timer(lapb); 206 - lapb_stop_t2timer(lapb); 207 - lapb->state = LAPB_STATE_3; 208 - lapb->condition = 0x00; 209 - lapb->n2count = 0; 210 - lapb->vs = 0; 211 - lapb->vr = 0; 212 - lapb->va = 0; 213 - lapb_connect_confirmation(lapb, LAPB_OK); 214 - } 215 - break; 160 + lapb_send_control(lapb, LAPB_UA, frame->pf, 161 + LAPB_RESPONSE); 162 + } 163 + break; 216 164 217 - case LAPB_DM: 165 + case LAPB_SABME: 218 166 #if LAPB_DEBUG > 1 219 - printk(KERN_DEBUG "lapb: (%p) S1 RX DM(%d)\n", 167 + printk(KERN_DEBUG "lapb: (%p) S1 RX SABME(%d)\n", 168 + lapb->dev, frame->pf); 169 + #endif 170 + if (lapb->mode & LAPB_EXTENDED) { 171 + #if LAPB_DEBUG > 1 172 + printk(KERN_DEBUG "lapb: (%p) S1 TX UA(%d)\n", 220 173 lapb->dev, frame->pf); 221 174 #endif 222 - if (frame->pf) { 223 - #if LAPB_DEBUG > 0 224 - printk(KERN_DEBUG "lapb: (%p) S1 -> S0\n", 225 - lapb->dev); 175 + lapb_send_control(lapb, LAPB_UA, frame->pf, 176 + LAPB_RESPONSE); 177 + } else { 178 + #if LAPB_DEBUG > 1 179 + printk(KERN_DEBUG "lapb: (%p) S1 TX DM(%d)\n", 180 + lapb->dev, frame->pf); 226 181 #endif 227 - lapb_clear_queues(lapb); 228 - lapb->state = LAPB_STATE_0; 229 - lapb_start_t1timer(lapb); 230 - lapb_stop_t2timer(lapb); 231 - lapb_disconnect_indication(lapb, LAPB_REFUSED); 232 - } 233 - break; 182 + lapb_send_control(lapb, LAPB_DM, frame->pf, 183 + LAPB_RESPONSE); 184 + } 185 + break; 186 + 187 + case LAPB_DISC: 188 + #if LAPB_DEBUG > 1 189 + printk(KERN_DEBUG "lapb: (%p) S1 RX DISC(%d)\n", 190 + lapb->dev, frame->pf); 191 + printk(KERN_DEBUG "lapb: (%p) S1 TX DM(%d)\n", 192 + lapb->dev, frame->pf); 193 + #endif 194 + lapb_send_control(lapb, LAPB_DM, frame->pf, LAPB_RESPONSE); 195 + break; 196 + 197 + case LAPB_UA: 198 + #if LAPB_DEBUG > 1 199 + printk(KERN_DEBUG "lapb: (%p) S1 RX UA(%d)\n", 200 + lapb->dev, frame->pf); 201 + #endif 202 + if (frame->pf) { 203 + #if LAPB_DEBUG > 0 204 + printk(KERN_DEBUG "lapb: (%p) S1 -> S3\n", lapb->dev); 205 + #endif 206 + lapb_stop_t1timer(lapb); 207 + lapb_stop_t2timer(lapb); 208 + lapb->state = LAPB_STATE_3; 209 + lapb->condition = 0x00; 210 + lapb->n2count = 0; 211 + lapb->vs = 0; 212 + lapb->vr = 0; 213 + lapb->va = 0; 214 + lapb_connect_confirmation(lapb, LAPB_OK); 215 + } 216 + break; 217 + 218 + case LAPB_DM: 219 + #if LAPB_DEBUG > 1 220 + printk(KERN_DEBUG "lapb: (%p) S1 RX DM(%d)\n", 221 + lapb->dev, frame->pf); 222 + #endif 223 + if (frame->pf) { 224 + #if LAPB_DEBUG > 0 225 + printk(KERN_DEBUG "lapb: (%p) S1 -> S0\n", lapb->dev); 226 + #endif 227 + lapb_clear_queues(lapb); 228 + lapb->state = LAPB_STATE_0; 229 + lapb_start_t1timer(lapb); 230 + lapb_stop_t2timer(lapb); 231 + lapb_disconnect_indication(lapb, LAPB_REFUSED); 232 + } 233 + break; 234 234 } 235 235 236 236 kfree_skb(skb); ··· 241 247 struct lapb_frame *frame) 242 248 { 243 249 switch (frame->type) { 244 - case LAPB_SABM: 245 - case LAPB_SABME: 250 + case LAPB_SABM: 251 + case LAPB_SABME: 246 252 #if LAPB_DEBUG > 1 247 - printk(KERN_DEBUG "lapb: (%p) S2 RX {SABM,SABME}(%d)\n", 248 - lapb->dev, frame->pf); 249 - printk(KERN_DEBUG "lapb: (%p) S2 TX DM(%d)\n", 250 - lapb->dev, frame->pf); 253 + printk(KERN_DEBUG "lapb: (%p) S2 RX {SABM,SABME}(%d)\n", 254 + lapb->dev, frame->pf); 255 + printk(KERN_DEBUG "lapb: (%p) S2 TX DM(%d)\n", 256 + lapb->dev, frame->pf); 251 257 #endif 258 + lapb_send_control(lapb, LAPB_DM, frame->pf, LAPB_RESPONSE); 259 + break; 260 + 261 + case LAPB_DISC: 262 + #if LAPB_DEBUG > 1 263 + printk(KERN_DEBUG "lapb: (%p) S2 RX DISC(%d)\n", 264 + lapb->dev, frame->pf); 265 + printk(KERN_DEBUG "lapb: (%p) S2 TX UA(%d)\n", 266 + lapb->dev, frame->pf); 267 + #endif 268 + lapb_send_control(lapb, LAPB_UA, frame->pf, LAPB_RESPONSE); 269 + break; 270 + 271 + case LAPB_UA: 272 + #if LAPB_DEBUG > 1 273 + printk(KERN_DEBUG "lapb: (%p) S2 RX UA(%d)\n", 274 + lapb->dev, frame->pf); 275 + #endif 276 + if (frame->pf) { 277 + #if LAPB_DEBUG > 0 278 + printk(KERN_DEBUG "lapb: (%p) S2 -> S0\n", lapb->dev); 279 + #endif 280 + lapb->state = LAPB_STATE_0; 281 + lapb_start_t1timer(lapb); 282 + lapb_stop_t2timer(lapb); 283 + lapb_disconnect_confirmation(lapb, LAPB_OK); 284 + } 285 + break; 286 + 287 + case LAPB_DM: 288 + #if LAPB_DEBUG > 1 289 + printk(KERN_DEBUG "lapb: (%p) S2 RX DM(%d)\n", 290 + lapb->dev, frame->pf); 291 + #endif 292 + if (frame->pf) { 293 + #if LAPB_DEBUG > 0 294 + printk(KERN_DEBUG "lapb: (%p) S2 -> S0\n", lapb->dev); 295 + #endif 296 + lapb->state = LAPB_STATE_0; 297 + lapb_start_t1timer(lapb); 298 + lapb_stop_t2timer(lapb); 299 + lapb_disconnect_confirmation(lapb, LAPB_NOTCONNECTED); 300 + } 301 + break; 302 + 303 + case LAPB_I: 304 + case LAPB_REJ: 305 + case LAPB_RNR: 306 + case LAPB_RR: 307 + #if LAPB_DEBUG > 1 308 + printk(KERN_DEBUG "lapb: (%p) S2 RX {I,REJ,RNR,RR}(%d)\n", 309 + lapb->dev, frame->pf); 310 + printk(KERN_DEBUG "lapb: (%p) S2 RX DM(%d)\n", 311 + lapb->dev, frame->pf); 312 + #endif 313 + if (frame->pf) 252 314 lapb_send_control(lapb, LAPB_DM, frame->pf, 253 315 LAPB_RESPONSE); 254 - break; 255 - 256 - case LAPB_DISC: 257 - #if LAPB_DEBUG > 1 258 - printk(KERN_DEBUG "lapb: (%p) S2 RX DISC(%d)\n", 259 - lapb->dev, frame->pf); 260 - printk(KERN_DEBUG "lapb: (%p) S2 TX UA(%d)\n", 261 - lapb->dev, frame->pf); 262 - #endif 263 - lapb_send_control(lapb, LAPB_UA, frame->pf, 264 - LAPB_RESPONSE); 265 - break; 266 - 267 - case LAPB_UA: 268 - #if LAPB_DEBUG > 1 269 - printk(KERN_DEBUG "lapb: (%p) S2 RX UA(%d)\n", 270 - lapb->dev, frame->pf); 271 - #endif 272 - if (frame->pf) { 273 - #if LAPB_DEBUG > 0 274 - printk(KERN_DEBUG "lapb: (%p) S2 -> S0\n", 275 - lapb->dev); 276 - #endif 277 - lapb->state = LAPB_STATE_0; 278 - lapb_start_t1timer(lapb); 279 - lapb_stop_t2timer(lapb); 280 - lapb_disconnect_confirmation(lapb, LAPB_OK); 281 - } 282 - break; 283 - 284 - case LAPB_DM: 285 - #if LAPB_DEBUG > 1 286 - printk(KERN_DEBUG "lapb: (%p) S2 RX DM(%d)\n", 287 - lapb->dev, frame->pf); 288 - #endif 289 - if (frame->pf) { 290 - #if LAPB_DEBUG > 0 291 - printk(KERN_DEBUG "lapb: (%p) S2 -> S0\n", 292 - lapb->dev); 293 - #endif 294 - lapb->state = LAPB_STATE_0; 295 - lapb_start_t1timer(lapb); 296 - lapb_stop_t2timer(lapb); 297 - lapb_disconnect_confirmation(lapb, 298 - LAPB_NOTCONNECTED); 299 - } 300 - break; 301 - 302 - case LAPB_I: 303 - case LAPB_REJ: 304 - case LAPB_RNR: 305 - case LAPB_RR: 306 - #if LAPB_DEBUG > 1 307 - printk(KERN_DEBUG "lapb: (%p) S2 RX {I,REJ,RNR,RR}" 308 - "(%d)\n", lapb->dev, frame->pf); 309 - printk(KERN_DEBUG "lapb: (%p) S2 RX DM(%d)\n", 310 - lapb->dev, frame->pf); 311 - #endif 312 - if (frame->pf) 313 - lapb_send_control(lapb, LAPB_DM, frame->pf, 314 - LAPB_RESPONSE); 315 - break; 316 + break; 316 317 } 317 318 318 319 kfree_skb(skb); ··· 325 336 LAPB_SMODULUS; 326 337 327 338 switch (frame->type) { 328 - case LAPB_SABM: 339 + case LAPB_SABM: 329 340 #if LAPB_DEBUG > 1 330 - printk(KERN_DEBUG "lapb: (%p) S3 RX SABM(%d)\n", 341 + printk(KERN_DEBUG "lapb: (%p) S3 RX SABM(%d)\n", 342 + lapb->dev, frame->pf); 343 + #endif 344 + if (lapb->mode & LAPB_EXTENDED) { 345 + #if LAPB_DEBUG > 1 346 + printk(KERN_DEBUG "lapb: (%p) S3 TX DM(%d)\n", 331 347 lapb->dev, frame->pf); 332 348 #endif 333 - if (lapb->mode & LAPB_EXTENDED) { 349 + lapb_send_control(lapb, LAPB_DM, frame->pf, 350 + LAPB_RESPONSE); 351 + } else { 334 352 #if LAPB_DEBUG > 1 335 - printk(KERN_DEBUG "lapb: (%p) S3 TX DM(%d)\n", 336 - lapb->dev, frame->pf); 337 - #endif 338 - lapb_send_control(lapb, LAPB_DM, frame->pf, 339 - LAPB_RESPONSE); 340 - } else { 341 - #if LAPB_DEBUG > 1 342 - printk(KERN_DEBUG "lapb: (%p) S3 TX UA(%d)\n", 343 - lapb->dev, frame->pf); 344 - #endif 345 - lapb_send_control(lapb, LAPB_UA, frame->pf, 346 - LAPB_RESPONSE); 347 - lapb_stop_t1timer(lapb); 348 - lapb_stop_t2timer(lapb); 349 - lapb->condition = 0x00; 350 - lapb->n2count = 0; 351 - lapb->vs = 0; 352 - lapb->vr = 0; 353 - lapb->va = 0; 354 - lapb_requeue_frames(lapb); 355 - } 356 - break; 357 - 358 - case LAPB_SABME: 359 - #if LAPB_DEBUG > 1 360 - printk(KERN_DEBUG "lapb: (%p) S3 RX SABME(%d)\n", 353 + printk(KERN_DEBUG "lapb: (%p) S3 TX UA(%d)\n", 361 354 lapb->dev, frame->pf); 362 355 #endif 363 - if (lapb->mode & LAPB_EXTENDED) { 364 - #if LAPB_DEBUG > 1 365 - printk(KERN_DEBUG "lapb: (%p) S3 TX UA(%d)\n", 366 - lapb->dev, frame->pf); 367 - #endif 368 - lapb_send_control(lapb, LAPB_UA, frame->pf, 369 - LAPB_RESPONSE); 370 - lapb_stop_t1timer(lapb); 371 - lapb_stop_t2timer(lapb); 372 - lapb->condition = 0x00; 373 - lapb->n2count = 0; 374 - lapb->vs = 0; 375 - lapb->vr = 0; 376 - lapb->va = 0; 377 - lapb_requeue_frames(lapb); 378 - } else { 379 - #if LAPB_DEBUG > 1 380 - printk(KERN_DEBUG "lapb: (%p) S3 TX DM(%d)\n", 381 - lapb->dev, frame->pf); 382 - #endif 383 - lapb_send_control(lapb, LAPB_DM, frame->pf, 384 - LAPB_RESPONSE); 385 - } 386 - break; 387 - 388 - case LAPB_DISC: 389 - #if LAPB_DEBUG > 1 390 - printk(KERN_DEBUG "lapb: (%p) S3 RX DISC(%d)\n", 391 - lapb->dev, frame->pf); 392 - #endif 393 - #if LAPB_DEBUG > 0 394 - printk(KERN_DEBUG "lapb: (%p) S3 -> S0\n", 395 - lapb->dev); 396 - #endif 397 - lapb_clear_queues(lapb); 398 356 lapb_send_control(lapb, LAPB_UA, frame->pf, 399 357 LAPB_RESPONSE); 400 - lapb_start_t1timer(lapb); 358 + lapb_stop_t1timer(lapb); 401 359 lapb_stop_t2timer(lapb); 402 - lapb->state = LAPB_STATE_0; 403 - lapb_disconnect_indication(lapb, LAPB_OK); 404 - break; 405 - 406 - case LAPB_DM: 407 - #if LAPB_DEBUG > 1 408 - printk(KERN_DEBUG "lapb: (%p) S3 RX DM(%d)\n", 409 - lapb->dev, frame->pf); 410 - #endif 411 - #if LAPB_DEBUG > 0 412 - printk(KERN_DEBUG "lapb: (%p) S3 -> S0\n", 413 - lapb->dev); 414 - #endif 415 - lapb_clear_queues(lapb); 416 - lapb->state = LAPB_STATE_0; 417 - lapb_start_t1timer(lapb); 418 - lapb_stop_t2timer(lapb); 419 - lapb_disconnect_indication(lapb, LAPB_NOTCONNECTED); 420 - break; 421 - 422 - case LAPB_RNR: 423 - #if LAPB_DEBUG > 1 424 - printk(KERN_DEBUG "lapb: (%p) S3 RX RNR(%d) R%d\n", 425 - lapb->dev, frame->pf, frame->nr); 426 - #endif 427 - lapb->condition |= LAPB_PEER_RX_BUSY_CONDITION; 428 - lapb_check_need_response(lapb, frame->cr, frame->pf); 429 - if (lapb_validate_nr(lapb, frame->nr)) { 430 - lapb_check_iframes_acked(lapb, frame->nr); 431 - } else { 432 - lapb->frmr_data = *frame; 433 - lapb->frmr_type = LAPB_FRMR_Z; 434 - lapb_transmit_frmr(lapb); 435 - #if LAPB_DEBUG > 0 436 - printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", 437 - lapb->dev); 438 - #endif 439 - lapb_start_t1timer(lapb); 440 - lapb_stop_t2timer(lapb); 441 - lapb->state = LAPB_STATE_4; 442 - lapb->n2count = 0; 443 - } 444 - break; 445 - 446 - case LAPB_RR: 447 - #if LAPB_DEBUG > 1 448 - printk(KERN_DEBUG "lapb: (%p) S3 RX RR(%d) R%d\n", 449 - lapb->dev, frame->pf, frame->nr); 450 - #endif 451 - lapb->condition &= ~LAPB_PEER_RX_BUSY_CONDITION; 452 - lapb_check_need_response(lapb, frame->cr, frame->pf); 453 - if (lapb_validate_nr(lapb, frame->nr)) { 454 - lapb_check_iframes_acked(lapb, frame->nr); 455 - } else { 456 - lapb->frmr_data = *frame; 457 - lapb->frmr_type = LAPB_FRMR_Z; 458 - lapb_transmit_frmr(lapb); 459 - #if LAPB_DEBUG > 0 460 - printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", 461 - lapb->dev); 462 - #endif 463 - lapb_start_t1timer(lapb); 464 - lapb_stop_t2timer(lapb); 465 - lapb->state = LAPB_STATE_4; 466 - lapb->n2count = 0; 467 - } 468 - break; 469 - 470 - case LAPB_REJ: 471 - #if LAPB_DEBUG > 1 472 - printk(KERN_DEBUG "lapb: (%p) S3 RX REJ(%d) R%d\n", 473 - lapb->dev, frame->pf, frame->nr); 474 - #endif 475 - lapb->condition &= ~LAPB_PEER_RX_BUSY_CONDITION; 476 - lapb_check_need_response(lapb, frame->cr, frame->pf); 477 - if (lapb_validate_nr(lapb, frame->nr)) { 478 - lapb_frames_acked(lapb, frame->nr); 479 - lapb_stop_t1timer(lapb); 480 - lapb->n2count = 0; 481 - lapb_requeue_frames(lapb); 482 - } else { 483 - lapb->frmr_data = *frame; 484 - lapb->frmr_type = LAPB_FRMR_Z; 485 - lapb_transmit_frmr(lapb); 486 - #if LAPB_DEBUG > 0 487 - printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", 488 - lapb->dev); 489 - #endif 490 - lapb_start_t1timer(lapb); 491 - lapb_stop_t2timer(lapb); 492 - lapb->state = LAPB_STATE_4; 493 - lapb->n2count = 0; 494 - } 495 - break; 496 - 497 - case LAPB_I: 498 - #if LAPB_DEBUG > 1 499 - printk(KERN_DEBUG "lapb: (%p) S3 RX I(%d) S%d R%d\n", 500 - lapb->dev, frame->pf, frame->ns, frame->nr); 501 - #endif 502 - if (!lapb_validate_nr(lapb, frame->nr)) { 503 - lapb->frmr_data = *frame; 504 - lapb->frmr_type = LAPB_FRMR_Z; 505 - lapb_transmit_frmr(lapb); 506 - #if LAPB_DEBUG > 0 507 - printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", 508 - lapb->dev); 509 - #endif 510 - lapb_start_t1timer(lapb); 511 - lapb_stop_t2timer(lapb); 512 - lapb->state = LAPB_STATE_4; 513 - lapb->n2count = 0; 514 - break; 515 - } 516 - if (lapb->condition & LAPB_PEER_RX_BUSY_CONDITION) 517 - lapb_frames_acked(lapb, frame->nr); 518 - else 519 - lapb_check_iframes_acked(lapb, frame->nr); 520 - 521 - if (frame->ns == lapb->vr) { 522 - int cn; 523 - cn = lapb_data_indication(lapb, skb); 524 - queued = 1; 525 - /* 526 - * If upper layer has dropped the frame, we 527 - * basically ignore any further protocol 528 - * processing. This will cause the peer 529 - * to re-transmit the frame later like 530 - * a frame lost on the wire. 531 - */ 532 - if (cn == NET_RX_DROP) { 533 - printk(KERN_DEBUG 534 - "LAPB: rx congestion\n"); 535 - break; 536 - } 537 - lapb->vr = (lapb->vr + 1) % modulus; 538 - lapb->condition &= ~LAPB_REJECT_CONDITION; 539 - if (frame->pf) 540 - lapb_enquiry_response(lapb); 541 - else { 542 - if (!(lapb->condition & 543 - LAPB_ACK_PENDING_CONDITION)) { 544 - lapb->condition |= LAPB_ACK_PENDING_CONDITION; 545 - lapb_start_t2timer(lapb); 546 - } 547 - } 548 - } else { 549 - if (lapb->condition & LAPB_REJECT_CONDITION) { 550 - if (frame->pf) 551 - lapb_enquiry_response(lapb); 552 - } else { 553 - #if LAPB_DEBUG > 1 554 - printk(KERN_DEBUG 555 - "lapb: (%p) S3 TX REJ(%d) R%d\n", 556 - lapb->dev, frame->pf, lapb->vr); 557 - #endif 558 - lapb->condition |= LAPB_REJECT_CONDITION; 559 - lapb_send_control(lapb, LAPB_REJ, 560 - frame->pf, 561 - LAPB_RESPONSE); 562 - lapb->condition &= ~LAPB_ACK_PENDING_CONDITION; 563 - } 564 - } 565 - break; 566 - 567 - case LAPB_FRMR: 568 - #if LAPB_DEBUG > 1 569 - printk(KERN_DEBUG "lapb: (%p) S3 RX FRMR(%d) %02X " 570 - "%02X %02X %02X %02X\n", lapb->dev, frame->pf, 571 - skb->data[0], skb->data[1], skb->data[2], 572 - skb->data[3], skb->data[4]); 573 - #endif 574 - lapb_establish_data_link(lapb); 575 - #if LAPB_DEBUG > 0 576 - printk(KERN_DEBUG "lapb: (%p) S3 -> S1\n", 577 - lapb->dev); 578 - #endif 360 + lapb->condition = 0x00; 361 + lapb->n2count = 0; 362 + lapb->vs = 0; 363 + lapb->vr = 0; 364 + lapb->va = 0; 579 365 lapb_requeue_frames(lapb); 580 - lapb->state = LAPB_STATE_1; 581 - break; 366 + } 367 + break; 582 368 583 - case LAPB_ILLEGAL: 369 + case LAPB_SABME: 584 370 #if LAPB_DEBUG > 1 585 - printk(KERN_DEBUG "lapb: (%p) S3 RX ILLEGAL(%d)\n", 371 + printk(KERN_DEBUG "lapb: (%p) S3 RX SABME(%d)\n", 372 + lapb->dev, frame->pf); 373 + #endif 374 + if (lapb->mode & LAPB_EXTENDED) { 375 + #if LAPB_DEBUG > 1 376 + printk(KERN_DEBUG "lapb: (%p) S3 TX UA(%d)\n", 586 377 lapb->dev, frame->pf); 587 378 #endif 379 + lapb_send_control(lapb, LAPB_UA, frame->pf, 380 + LAPB_RESPONSE); 381 + lapb_stop_t1timer(lapb); 382 + lapb_stop_t2timer(lapb); 383 + lapb->condition = 0x00; 384 + lapb->n2count = 0; 385 + lapb->vs = 0; 386 + lapb->vr = 0; 387 + lapb->va = 0; 388 + lapb_requeue_frames(lapb); 389 + } else { 390 + #if LAPB_DEBUG > 1 391 + printk(KERN_DEBUG "lapb: (%p) S3 TX DM(%d)\n", 392 + lapb->dev, frame->pf); 393 + #endif 394 + lapb_send_control(lapb, LAPB_DM, frame->pf, 395 + LAPB_RESPONSE); 396 + } 397 + break; 398 + 399 + case LAPB_DISC: 400 + #if LAPB_DEBUG > 1 401 + printk(KERN_DEBUG "lapb: (%p) S3 RX DISC(%d)\n", 402 + lapb->dev, frame->pf); 403 + #endif 404 + #if LAPB_DEBUG > 0 405 + printk(KERN_DEBUG "lapb: (%p) S3 -> S0\n", lapb->dev); 406 + #endif 407 + lapb_clear_queues(lapb); 408 + lapb_send_control(lapb, LAPB_UA, frame->pf, LAPB_RESPONSE); 409 + lapb_start_t1timer(lapb); 410 + lapb_stop_t2timer(lapb); 411 + lapb->state = LAPB_STATE_0; 412 + lapb_disconnect_indication(lapb, LAPB_OK); 413 + break; 414 + 415 + case LAPB_DM: 416 + #if LAPB_DEBUG > 1 417 + printk(KERN_DEBUG "lapb: (%p) S3 RX DM(%d)\n", 418 + lapb->dev, frame->pf); 419 + #endif 420 + #if LAPB_DEBUG > 0 421 + printk(KERN_DEBUG "lapb: (%p) S3 -> S0\n", lapb->dev); 422 + #endif 423 + lapb_clear_queues(lapb); 424 + lapb->state = LAPB_STATE_0; 425 + lapb_start_t1timer(lapb); 426 + lapb_stop_t2timer(lapb); 427 + lapb_disconnect_indication(lapb, LAPB_NOTCONNECTED); 428 + break; 429 + 430 + case LAPB_RNR: 431 + #if LAPB_DEBUG > 1 432 + printk(KERN_DEBUG "lapb: (%p) S3 RX RNR(%d) R%d\n", 433 + lapb->dev, frame->pf, frame->nr); 434 + #endif 435 + lapb->condition |= LAPB_PEER_RX_BUSY_CONDITION; 436 + lapb_check_need_response(lapb, frame->cr, frame->pf); 437 + if (lapb_validate_nr(lapb, frame->nr)) { 438 + lapb_check_iframes_acked(lapb, frame->nr); 439 + } else { 588 440 lapb->frmr_data = *frame; 589 - lapb->frmr_type = LAPB_FRMR_W; 441 + lapb->frmr_type = LAPB_FRMR_Z; 442 + lapb_transmit_frmr(lapb); 443 + #if LAPB_DEBUG > 0 444 + printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", lapb->dev); 445 + #endif 446 + lapb_start_t1timer(lapb); 447 + lapb_stop_t2timer(lapb); 448 + lapb->state = LAPB_STATE_4; 449 + lapb->n2count = 0; 450 + } 451 + break; 452 + 453 + case LAPB_RR: 454 + #if LAPB_DEBUG > 1 455 + printk(KERN_DEBUG "lapb: (%p) S3 RX RR(%d) R%d\n", 456 + lapb->dev, frame->pf, frame->nr); 457 + #endif 458 + lapb->condition &= ~LAPB_PEER_RX_BUSY_CONDITION; 459 + lapb_check_need_response(lapb, frame->cr, frame->pf); 460 + if (lapb_validate_nr(lapb, frame->nr)) { 461 + lapb_check_iframes_acked(lapb, frame->nr); 462 + } else { 463 + lapb->frmr_data = *frame; 464 + lapb->frmr_type = LAPB_FRMR_Z; 465 + lapb_transmit_frmr(lapb); 466 + #if LAPB_DEBUG > 0 467 + printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", lapb->dev); 468 + #endif 469 + lapb_start_t1timer(lapb); 470 + lapb_stop_t2timer(lapb); 471 + lapb->state = LAPB_STATE_4; 472 + lapb->n2count = 0; 473 + } 474 + break; 475 + 476 + case LAPB_REJ: 477 + #if LAPB_DEBUG > 1 478 + printk(KERN_DEBUG "lapb: (%p) S3 RX REJ(%d) R%d\n", 479 + lapb->dev, frame->pf, frame->nr); 480 + #endif 481 + lapb->condition &= ~LAPB_PEER_RX_BUSY_CONDITION; 482 + lapb_check_need_response(lapb, frame->cr, frame->pf); 483 + if (lapb_validate_nr(lapb, frame->nr)) { 484 + lapb_frames_acked(lapb, frame->nr); 485 + lapb_stop_t1timer(lapb); 486 + lapb->n2count = 0; 487 + lapb_requeue_frames(lapb); 488 + } else { 489 + lapb->frmr_data = *frame; 490 + lapb->frmr_type = LAPB_FRMR_Z; 491 + lapb_transmit_frmr(lapb); 492 + #if LAPB_DEBUG > 0 493 + printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", lapb->dev); 494 + #endif 495 + lapb_start_t1timer(lapb); 496 + lapb_stop_t2timer(lapb); 497 + lapb->state = LAPB_STATE_4; 498 + lapb->n2count = 0; 499 + } 500 + break; 501 + 502 + case LAPB_I: 503 + #if LAPB_DEBUG > 1 504 + printk(KERN_DEBUG "lapb: (%p) S3 RX I(%d) S%d R%d\n", 505 + lapb->dev, frame->pf, frame->ns, frame->nr); 506 + #endif 507 + if (!lapb_validate_nr(lapb, frame->nr)) { 508 + lapb->frmr_data = *frame; 509 + lapb->frmr_type = LAPB_FRMR_Z; 590 510 lapb_transmit_frmr(lapb); 591 511 #if LAPB_DEBUG > 0 592 512 printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", lapb->dev); ··· 505 607 lapb->state = LAPB_STATE_4; 506 608 lapb->n2count = 0; 507 609 break; 610 + } 611 + if (lapb->condition & LAPB_PEER_RX_BUSY_CONDITION) 612 + lapb_frames_acked(lapb, frame->nr); 613 + else 614 + lapb_check_iframes_acked(lapb, frame->nr); 615 + 616 + if (frame->ns == lapb->vr) { 617 + int cn; 618 + cn = lapb_data_indication(lapb, skb); 619 + queued = 1; 620 + /* 621 + * If upper layer has dropped the frame, we 622 + * basically ignore any further protocol 623 + * processing. This will cause the peer 624 + * to re-transmit the frame later like 625 + * a frame lost on the wire. 626 + */ 627 + if (cn == NET_RX_DROP) { 628 + printk(KERN_DEBUG "LAPB: rx congestion\n"); 629 + break; 630 + } 631 + lapb->vr = (lapb->vr + 1) % modulus; 632 + lapb->condition &= ~LAPB_REJECT_CONDITION; 633 + if (frame->pf) 634 + lapb_enquiry_response(lapb); 635 + else { 636 + if (!(lapb->condition & 637 + LAPB_ACK_PENDING_CONDITION)) { 638 + lapb->condition |= LAPB_ACK_PENDING_CONDITION; 639 + lapb_start_t2timer(lapb); 640 + } 641 + } 642 + } else { 643 + if (lapb->condition & LAPB_REJECT_CONDITION) { 644 + if (frame->pf) 645 + lapb_enquiry_response(lapb); 646 + } else { 647 + #if LAPB_DEBUG > 1 648 + printk(KERN_DEBUG 649 + "lapb: (%p) S3 TX REJ(%d) R%d\n", 650 + lapb->dev, frame->pf, lapb->vr); 651 + #endif 652 + lapb->condition |= LAPB_REJECT_CONDITION; 653 + lapb_send_control(lapb, LAPB_REJ, frame->pf, 654 + LAPB_RESPONSE); 655 + lapb->condition &= ~LAPB_ACK_PENDING_CONDITION; 656 + } 657 + } 658 + break; 659 + 660 + case LAPB_FRMR: 661 + #if LAPB_DEBUG > 1 662 + printk(KERN_DEBUG "lapb: (%p) S3 RX FRMR(%d) %02X " 663 + "%02X %02X %02X %02X\n", lapb->dev, frame->pf, 664 + skb->data[0], skb->data[1], skb->data[2], 665 + skb->data[3], skb->data[4]); 666 + #endif 667 + lapb_establish_data_link(lapb); 668 + #if LAPB_DEBUG > 0 669 + printk(KERN_DEBUG "lapb: (%p) S3 -> S1\n", lapb->dev); 670 + #endif 671 + lapb_requeue_frames(lapb); 672 + lapb->state = LAPB_STATE_1; 673 + break; 674 + 675 + case LAPB_ILLEGAL: 676 + #if LAPB_DEBUG > 1 677 + printk(KERN_DEBUG "lapb: (%p) S3 RX ILLEGAL(%d)\n", 678 + lapb->dev, frame->pf); 679 + #endif 680 + lapb->frmr_data = *frame; 681 + lapb->frmr_type = LAPB_FRMR_W; 682 + lapb_transmit_frmr(lapb); 683 + #if LAPB_DEBUG > 0 684 + printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", lapb->dev); 685 + #endif 686 + lapb_start_t1timer(lapb); 687 + lapb_stop_t2timer(lapb); 688 + lapb->state = LAPB_STATE_4; 689 + lapb->n2count = 0; 690 + break; 508 691 } 509 692 510 693 if (!queued) ··· 600 621 struct lapb_frame *frame) 601 622 { 602 623 switch (frame->type) { 603 - case LAPB_SABM: 624 + case LAPB_SABM: 604 625 #if LAPB_DEBUG > 1 605 - printk(KERN_DEBUG "lapb: (%p) S4 RX SABM(%d)\n", 626 + printk(KERN_DEBUG "lapb: (%p) S4 RX SABM(%d)\n", 627 + lapb->dev, frame->pf); 628 + #endif 629 + if (lapb->mode & LAPB_EXTENDED) { 630 + #if LAPB_DEBUG > 1 631 + printk(KERN_DEBUG "lapb: (%p) S4 TX DM(%d)\n", 606 632 lapb->dev, frame->pf); 607 633 #endif 608 - if (lapb->mode & LAPB_EXTENDED) { 634 + lapb_send_control(lapb, LAPB_DM, frame->pf, 635 + LAPB_RESPONSE); 636 + } else { 609 637 #if LAPB_DEBUG > 1 610 - printk(KERN_DEBUG "lapb: (%p) S4 TX DM(%d)\n", 611 - lapb->dev, frame->pf); 612 - #endif 613 - lapb_send_control(lapb, LAPB_DM, frame->pf, 614 - LAPB_RESPONSE); 615 - } else { 616 - #if LAPB_DEBUG > 1 617 - printk(KERN_DEBUG "lapb: (%p) S4 TX UA(%d)\n", 618 - lapb->dev, frame->pf); 638 + printk(KERN_DEBUG "lapb: (%p) S4 TX UA(%d)\n", 639 + lapb->dev, frame->pf); 619 640 #endif 620 641 #if LAPB_DEBUG > 0 621 - printk(KERN_DEBUG "lapb: (%p) S4 -> S3\n", 622 - lapb->dev); 642 + printk(KERN_DEBUG "lapb: (%p) S4 -> S3\n", lapb->dev); 623 643 #endif 624 - lapb_send_control(lapb, LAPB_UA, frame->pf, 625 - LAPB_RESPONSE); 626 - lapb_stop_t1timer(lapb); 627 - lapb_stop_t2timer(lapb); 628 - lapb->state = LAPB_STATE_3; 629 - lapb->condition = 0x00; 630 - lapb->n2count = 0; 631 - lapb->vs = 0; 632 - lapb->vr = 0; 633 - lapb->va = 0; 634 - lapb_connect_indication(lapb, LAPB_OK); 635 - } 636 - break; 644 + lapb_send_control(lapb, LAPB_UA, frame->pf, 645 + LAPB_RESPONSE); 646 + lapb_stop_t1timer(lapb); 647 + lapb_stop_t2timer(lapb); 648 + lapb->state = LAPB_STATE_3; 649 + lapb->condition = 0x00; 650 + lapb->n2count = 0; 651 + lapb->vs = 0; 652 + lapb->vr = 0; 653 + lapb->va = 0; 654 + lapb_connect_indication(lapb, LAPB_OK); 655 + } 656 + break; 637 657 638 - case LAPB_SABME: 658 + case LAPB_SABME: 639 659 #if LAPB_DEBUG > 1 640 - printk(KERN_DEBUG "lapb: (%p) S4 RX SABME(%d)\n", 660 + printk(KERN_DEBUG "lapb: (%p) S4 RX SABME(%d)\n", 661 + lapb->dev, frame->pf); 662 + #endif 663 + if (lapb->mode & LAPB_EXTENDED) { 664 + #if LAPB_DEBUG > 1 665 + printk(KERN_DEBUG "lapb: (%p) S4 TX UA(%d)\n", 641 666 lapb->dev, frame->pf); 642 667 #endif 643 - if (lapb->mode & LAPB_EXTENDED) { 644 - #if LAPB_DEBUG > 1 645 - printk(KERN_DEBUG "lapb: (%p) S4 TX UA(%d)\n", 646 - lapb->dev, frame->pf); 647 - #endif 648 668 #if LAPB_DEBUG > 0 649 - printk(KERN_DEBUG "lapb: (%p) S4 -> S3\n", 650 - lapb->dev); 669 + printk(KERN_DEBUG "lapb: (%p) S4 -> S3\n", lapb->dev); 651 670 #endif 652 - lapb_send_control(lapb, LAPB_UA, frame->pf, 653 - LAPB_RESPONSE); 654 - lapb_stop_t1timer(lapb); 655 - lapb_stop_t2timer(lapb); 656 - lapb->state = LAPB_STATE_3; 657 - lapb->condition = 0x00; 658 - lapb->n2count = 0; 659 - lapb->vs = 0; 660 - lapb->vr = 0; 661 - lapb->va = 0; 662 - lapb_connect_indication(lapb, LAPB_OK); 663 - } else { 671 + lapb_send_control(lapb, LAPB_UA, frame->pf, 672 + LAPB_RESPONSE); 673 + lapb_stop_t1timer(lapb); 674 + lapb_stop_t2timer(lapb); 675 + lapb->state = LAPB_STATE_3; 676 + lapb->condition = 0x00; 677 + lapb->n2count = 0; 678 + lapb->vs = 0; 679 + lapb->vr = 0; 680 + lapb->va = 0; 681 + lapb_connect_indication(lapb, LAPB_OK); 682 + } else { 664 683 #if LAPB_DEBUG > 1 665 - printk(KERN_DEBUG "lapb: (%p) S4 TX DM(%d)\n", 666 - lapb->dev, frame->pf); 684 + printk(KERN_DEBUG "lapb: (%p) S4 TX DM(%d)\n", 685 + lapb->dev, frame->pf); 667 686 #endif 668 - lapb_send_control(lapb, LAPB_DM, frame->pf, 669 - LAPB_RESPONSE); 670 - } 671 - break; 687 + lapb_send_control(lapb, LAPB_DM, frame->pf, 688 + LAPB_RESPONSE); 689 + } 690 + break; 672 691 } 673 692 674 693 kfree_skb(skb);