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

[NET] AX25: Fix whitespace errors.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

YOSHIFUJI Hideaki and committed by
David S. Miller 528930b9 f7d57453

+106 -106
+52 -52
net/ax25/af_ax25.c
··· 263 263 { 264 264 ax25_cb *ax25=(ax25_cb *)data; 265 265 struct sock *sk; 266 - 266 + 267 267 sk=ax25->sk; 268 - 268 + 269 269 bh_lock_sock(sk); 270 270 sock_hold(sk); 271 271 ax25_destroy_socket(ax25); ··· 369 369 ax25_disconnect(ax25, ENETRESET); 370 370 break; 371 371 372 - case AX25_WINDOW: 373 - if (ax25->modulus == AX25_MODULUS) { 374 - if (ax25_ctl.arg < 1 || ax25_ctl.arg > 7) 375 - return -EINVAL; 376 - } else { 377 - if (ax25_ctl.arg < 1 || ax25_ctl.arg > 63) 378 - return -EINVAL; 379 - } 380 - ax25->window = ax25_ctl.arg; 381 - break; 372 + case AX25_WINDOW: 373 + if (ax25->modulus == AX25_MODULUS) { 374 + if (ax25_ctl.arg < 1 || ax25_ctl.arg > 7) 375 + return -EINVAL; 376 + } else { 377 + if (ax25_ctl.arg < 1 || ax25_ctl.arg > 63) 378 + return -EINVAL; 379 + } 380 + ax25->window = ax25_ctl.arg; 381 + break; 382 382 383 - case AX25_T1: 383 + case AX25_T1: 384 384 if (ax25_ctl.arg < 1) 385 - return -EINVAL; 386 - ax25->rtt = (ax25_ctl.arg * HZ) / 2; 387 - ax25->t1 = ax25_ctl.arg * HZ; 388 - break; 389 - 390 - case AX25_T2: 391 - if (ax25_ctl.arg < 1) 392 - return -EINVAL; 393 - ax25->t2 = ax25_ctl.arg * HZ; 394 - break; 395 - 396 - case AX25_N2: 397 - if (ax25_ctl.arg < 1 || ax25_ctl.arg > 31) 398 385 return -EINVAL; 399 - ax25->n2count = 0; 400 - ax25->n2 = ax25_ctl.arg; 401 - break; 386 + ax25->rtt = (ax25_ctl.arg * HZ) / 2; 387 + ax25->t1 = ax25_ctl.arg * HZ; 388 + break; 402 389 403 - case AX25_T3: 404 - if (ax25_ctl.arg < 0) 405 - return -EINVAL; 406 - ax25->t3 = ax25_ctl.arg * HZ; 407 - break; 390 + case AX25_T2: 391 + if (ax25_ctl.arg < 1) 392 + return -EINVAL; 393 + ax25->t2 = ax25_ctl.arg * HZ; 394 + break; 408 395 409 - case AX25_IDLE: 410 - if (ax25_ctl.arg < 0) 411 - return -EINVAL; 412 - ax25->idle = ax25_ctl.arg * 60 * HZ; 413 - break; 396 + case AX25_N2: 397 + if (ax25_ctl.arg < 1 || ax25_ctl.arg > 31) 398 + return -EINVAL; 399 + ax25->n2count = 0; 400 + ax25->n2 = ax25_ctl.arg; 401 + break; 414 402 415 - case AX25_PACLEN: 416 - if (ax25_ctl.arg < 16 || ax25_ctl.arg > 65535) 417 - return -EINVAL; 418 - ax25->paclen = ax25_ctl.arg; 419 - break; 403 + case AX25_T3: 404 + if (ax25_ctl.arg < 0) 405 + return -EINVAL; 406 + ax25->t3 = ax25_ctl.arg * HZ; 407 + break; 420 408 421 - default: 422 - return -EINVAL; 409 + case AX25_IDLE: 410 + if (ax25_ctl.arg < 0) 411 + return -EINVAL; 412 + ax25->idle = ax25_ctl.arg * 60 * HZ; 413 + break; 414 + 415 + case AX25_PACLEN: 416 + if (ax25_ctl.arg < 16 || ax25_ctl.arg > 65535) 417 + return -EINVAL; 418 + ax25->paclen = ax25_ctl.arg; 419 + break; 420 + 421 + default: 422 + return -EINVAL; 423 423 } 424 424 425 425 return 0; ··· 1209 1209 1210 1210 if (sk->sk_type == SOCK_SEQPACKET && 1211 1211 (ax25t=ax25_find_cb(&ax25->source_addr, &fsa->fsa_ax25.sax25_call, digi, 1212 - ax25->ax25_dev->dev))) { 1212 + ax25->ax25_dev->dev))) { 1213 1213 kfree(digi); 1214 1214 err = -EADDRINUSE; /* Already such a connection */ 1215 1215 ax25_cb_put(ax25t); ··· 1456 1456 err = -EMSGSIZE; 1457 1457 goto out; 1458 1458 } 1459 - 1459 + 1460 1460 if (usax != NULL) { 1461 1461 if (usax->sax25_family != AF_AX25) { 1462 1462 err = -EINVAL; ··· 1470 1470 else if (addr_len != sizeof(struct full_sockaddr_ax25)) { 1471 1471 /* support for old structure may go away some time */ 1472 1472 if ((addr_len < sizeof(struct sockaddr_ax25) + sizeof(ax25_address) * 6) || 1473 - (addr_len > sizeof(struct full_sockaddr_ax25))) { 1474 - err = -EINVAL; 1473 + (addr_len > sizeof(struct full_sockaddr_ax25))) { 1474 + err = -EINVAL; 1475 1475 goto out; 1476 1476 } 1477 1477 ··· 1624 1624 1625 1625 /* Now we can treat all alike */ 1626 1626 skb = skb_recv_datagram(sk, flags & ~MSG_DONTWAIT, 1627 - flags & MSG_DONTWAIT, &err); 1627 + flags & MSG_DONTWAIT, &err); 1628 1628 if (skb == NULL) 1629 1629 goto out; 1630 1630 ··· 1869 1869 return hlist_entry( ((struct ax25_cb *)v)->ax25_node.next, 1870 1870 struct ax25_cb, ax25_node); 1871 1871 } 1872 - 1872 + 1873 1873 static void ax25_info_stop(struct seq_file *seq, void *v) 1874 1874 { 1875 1875 spin_unlock_bh(&ax25_list_lock);
+3 -3
net/ax25/ax25_addr.c
··· 126 126 ct++; 127 127 } 128 128 129 - if ((a->ax25_call[ct] & 0x1E) == (b->ax25_call[ct] & 0x1E)) /* SSID without control bit */ 130 - return 0; 129 + if ((a->ax25_call[ct] & 0x1E) == (b->ax25_call[ct] & 0x1E)) /* SSID without control bit */ 130 + return 0; 131 131 132 - return 2; /* Partial match */ 132 + return 2; /* Partial match */ 133 133 } 134 134 135 135 EXPORT_SYMBOL(ax25cmp);
+43 -43
net/ax25/ax25_ip.c
··· 55 55 if (type == ETH_P_AX25) 56 56 return 0; 57 57 58 - /* header is an AX.25 UI frame from us to them */ 59 - buff = skb_push(skb, AX25_HEADER_LEN); 60 - *buff++ = 0x00; /* KISS DATA */ 58 + /* header is an AX.25 UI frame from us to them */ 59 + buff = skb_push(skb, AX25_HEADER_LEN); 60 + *buff++ = 0x00; /* KISS DATA */ 61 61 62 62 if (daddr != NULL) 63 63 memcpy(buff, daddr, dev->addr_len); /* Address specified */ 64 64 65 - buff[6] &= ~AX25_CBIT; 66 - buff[6] &= ~AX25_EBIT; 67 - buff[6] |= AX25_SSSID_SPARE; 68 - buff += AX25_ADDR_LEN; 65 + buff[6] &= ~AX25_CBIT; 66 + buff[6] &= ~AX25_EBIT; 67 + buff[6] |= AX25_SSSID_SPARE; 68 + buff += AX25_ADDR_LEN; 69 69 70 - if (saddr != NULL) 71 - memcpy(buff, saddr, dev->addr_len); 72 - else 73 - memcpy(buff, dev->dev_addr, dev->addr_len); 70 + if (saddr != NULL) 71 + memcpy(buff, saddr, dev->addr_len); 72 + else 73 + memcpy(buff, dev->dev_addr, dev->addr_len); 74 74 75 - buff[6] &= ~AX25_CBIT; 76 - buff[6] |= AX25_EBIT; 77 - buff[6] |= AX25_SSSID_SPARE; 78 - buff += AX25_ADDR_LEN; 75 + buff[6] &= ~AX25_CBIT; 76 + buff[6] |= AX25_EBIT; 77 + buff[6] |= AX25_SSSID_SPARE; 78 + buff += AX25_ADDR_LEN; 79 79 80 - *buff++ = AX25_UI; /* UI */ 80 + *buff++ = AX25_UI; /* UI */ 81 81 82 - /* Append a suitable AX.25 PID */ 83 - switch (type) { 84 - case ETH_P_IP: 85 - *buff++ = AX25_P_IP; 86 - break; 87 - case ETH_P_ARP: 88 - *buff++ = AX25_P_ARP; 89 - break; 90 - default: 91 - printk(KERN_ERR "AX.25: ax25_hard_header - wrong protocol type 0x%2.2x\n", type); 92 - *buff++ = 0; 93 - break; 94 - } 82 + /* Append a suitable AX.25 PID */ 83 + switch (type) { 84 + case ETH_P_IP: 85 + *buff++ = AX25_P_IP; 86 + break; 87 + case ETH_P_ARP: 88 + *buff++ = AX25_P_ARP; 89 + break; 90 + default: 91 + printk(KERN_ERR "AX.25: ax25_hard_header - wrong protocol type 0x%2.2x\n", type); 92 + *buff++ = 0; 93 + break; 94 + } 95 95 96 96 if (daddr != NULL) 97 - return AX25_HEADER_LEN; 97 + return AX25_HEADER_LEN; 98 98 99 99 return -AX25_HEADER_LEN; /* Unfinished header */ 100 100 } ··· 114 114 dst = (ax25_address *)(bp + 1); 115 115 src = (ax25_address *)(bp + 8); 116 116 117 - if (arp_find(bp + 1, skb)) 118 - return 1; 117 + if (arp_find(bp + 1, skb)) 118 + return 1; 119 119 120 120 route = ax25_get_route(dst, NULL); 121 121 if (route) { ··· 127 127 if (dev == NULL) 128 128 dev = skb->dev; 129 129 130 - if ((ax25_dev = ax25_dev_ax25dev(dev)) == NULL) { 131 - goto put; 130 + if ((ax25_dev = ax25_dev_ax25dev(dev)) == NULL) { 131 + goto put; 132 132 } 133 133 134 134 if (bp[16] == AX25_P_IP) { ··· 175 175 ourskb->nh.raw = ourskb->data; 176 176 177 177 ax25=ax25_send_frame( 178 - ourskb, 179 - ax25_dev->values[AX25_VALUES_PACLEN], 178 + ourskb, 179 + ax25_dev->values[AX25_VALUES_PACLEN], 180 180 &src_c, 181 181 &dst_c, digipeat, dev); 182 182 if (ax25) { ··· 186 186 } 187 187 } 188 188 189 - bp[7] &= ~AX25_CBIT; 190 - bp[7] &= ~AX25_EBIT; 191 - bp[7] |= AX25_SSSID_SPARE; 189 + bp[7] &= ~AX25_CBIT; 190 + bp[7] &= ~AX25_EBIT; 191 + bp[7] |= AX25_SSSID_SPARE; 192 192 193 - bp[14] &= ~AX25_CBIT; 194 - bp[14] |= AX25_EBIT; 195 - bp[14] |= AX25_SSSID_SPARE; 193 + bp[14] &= ~AX25_CBIT; 194 + bp[14] |= AX25_EBIT; 195 + bp[14] |= AX25_SSSID_SPARE; 196 196 197 197 skb_pull(skb, AX25_KISS_HEADER_LEN); 198 198 ··· 211 211 if (route) 212 212 ax25_put_route(route); 213 213 214 - return 1; 214 + return 1; 215 215 } 216 216 217 217 #else /* INET */
+4 -4
net/ax25/ax25_route.c
··· 87 87 ax25_rt = ax25_route_list; 88 88 while (ax25_rt != NULL) { 89 89 if (ax25cmp(&ax25_rt->callsign, &route->dest_addr) == 0 && 90 - ax25_rt->dev == ax25_dev->dev) { 90 + ax25_rt->dev == ax25_dev->dev) { 91 91 kfree(ax25_rt->digipeat); 92 92 ax25_rt->digipeat = NULL; 93 93 if (route->digi_count != 0) { ··· 252 252 { 253 253 struct ax25_route *ax25_rt; 254 254 int i = 1; 255 - 256 - read_lock(&ax25_route_lock); 255 + 256 + read_lock(&ax25_route_lock); 257 257 if (*pos == 0) 258 258 return SEQ_START_TOKEN; 259 259 ··· 269 269 static void *ax25_rt_seq_next(struct seq_file *seq, void *v, loff_t *pos) 270 270 { 271 271 ++*pos; 272 - return (v == SEQ_START_TOKEN) ? ax25_route_list : 272 + return (v == SEQ_START_TOKEN) ? ax25_route_list : 273 273 ((struct ax25_route *) v)->next; 274 274 } 275 275
+1 -1
net/ax25/ax25_std_timer.c
··· 34 34 void ax25_std_heartbeat_expiry(ax25_cb *ax25) 35 35 { 36 36 struct sock *sk=ax25->sk; 37 - 37 + 38 38 if (sk) 39 39 bh_lock_sock(sk); 40 40
+2 -2
net/ax25/ax25_subr.c
··· 56 56 */ 57 57 if (ax25->va != nr) { 58 58 while (skb_peek(&ax25->ack_queue) != NULL && ax25->va != nr) { 59 - skb = skb_dequeue(&ax25->ack_queue); 59 + skb = skb_dequeue(&ax25->ack_queue); 60 60 kfree_skb(skb); 61 61 ax25->va = (ax25->va + 1) % ax25->modulus; 62 62 } ··· 65 65 66 66 void ax25_requeue_frames(ax25_cb *ax25) 67 67 { 68 - struct sk_buff *skb, *skb_prev = NULL; 68 + struct sk_buff *skb, *skb_prev = NULL; 69 69 70 70 /* 71 71 * Requeue all the un-ack-ed frames on the output queue to be picked
+1 -1
net/ax25/ax25_uid.c
··· 164 164 ++*pos; 165 165 166 166 return hlist_entry(((ax25_uid_assoc *)v)->uid_node.next, 167 - ax25_uid_assoc, uid_node); 167 + ax25_uid_assoc, uid_node); 168 168 } 169 169 170 170 static void ax25_uid_seq_stop(struct seq_file *seq, void *v)