diff options
| author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2006-03-21 01:48:35 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-03-21 01:48:35 -0500 |
| commit | 543d9cfeec4d58ad3fd974db5531b06b6b95deb4 (patch) | |
| tree | b5f79a92ec01b4a97f26d48cae11566498641822 /net/ipv6/af_inet6.c | |
| parent | f94691acf9df35d5cd828373e35391bdc4a3fde6 (diff) | |
[NET]: Identation & other cleanups related to compat_[gs]etsockopt cset
No code changes, just tidying up, in some cases moving EXPORT_SYMBOLs
to just after the function exported, etc.
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/af_inet6.c')
| -rw-r--r-- | net/ipv6/af_inet6.c | 120 |
1 files changed, 60 insertions, 60 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 97844c4cd9b1..e19457fe4f6e 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c | |||
| @@ -456,53 +456,53 @@ int inet6_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) | |||
| 456 | } | 456 | } |
| 457 | 457 | ||
| 458 | const struct proto_ops inet6_stream_ops = { | 458 | const struct proto_ops inet6_stream_ops = { |
| 459 | .family = PF_INET6, | 459 | .family = PF_INET6, |
| 460 | .owner = THIS_MODULE, | 460 | .owner = THIS_MODULE, |
| 461 | .release = inet6_release, | 461 | .release = inet6_release, |
| 462 | .bind = inet6_bind, | 462 | .bind = inet6_bind, |
| 463 | .connect = inet_stream_connect, /* ok */ | 463 | .connect = inet_stream_connect, /* ok */ |
| 464 | .socketpair = sock_no_socketpair, /* a do nothing */ | 464 | .socketpair = sock_no_socketpair, /* a do nothing */ |
| 465 | .accept = inet_accept, /* ok */ | 465 | .accept = inet_accept, /* ok */ |
| 466 | .getname = inet6_getname, | 466 | .getname = inet6_getname, |
| 467 | .poll = tcp_poll, /* ok */ | 467 | .poll = tcp_poll, /* ok */ |
| 468 | .ioctl = inet6_ioctl, /* must change */ | 468 | .ioctl = inet6_ioctl, /* must change */ |
| 469 | .listen = inet_listen, /* ok */ | 469 | .listen = inet_listen, /* ok */ |
| 470 | .shutdown = inet_shutdown, /* ok */ | 470 | .shutdown = inet_shutdown, /* ok */ |
| 471 | .setsockopt = sock_common_setsockopt, /* ok */ | 471 | .setsockopt = sock_common_setsockopt, /* ok */ |
| 472 | .getsockopt = sock_common_getsockopt, /* ok */ | 472 | .getsockopt = sock_common_getsockopt, /* ok */ |
| 473 | .sendmsg = inet_sendmsg, /* ok */ | ||
| 474 | .recvmsg = sock_common_recvmsg, /* ok */ | ||
| 475 | .mmap = sock_no_mmap, | ||
| 476 | .sendpage = tcp_sendpage, | ||
| 473 | #ifdef CONFIG_COMPAT | 477 | #ifdef CONFIG_COMPAT |
| 474 | .compat_setsockopt = compat_sock_common_setsockopt, | 478 | .compat_setsockopt = compat_sock_common_setsockopt, |
| 475 | .compat_getsockopt = compat_sock_common_getsockopt, | 479 | .compat_getsockopt = compat_sock_common_getsockopt, |
| 476 | #endif | 480 | #endif |
| 477 | .sendmsg = inet_sendmsg, /* ok */ | ||
| 478 | .recvmsg = sock_common_recvmsg, /* ok */ | ||
| 479 | .mmap = sock_no_mmap, | ||
| 480 | .sendpage = tcp_sendpage | ||
| 481 | }; | 481 | }; |
| 482 | 482 | ||
| 483 | const struct proto_ops inet6_dgram_ops = { | 483 | const struct proto_ops inet6_dgram_ops = { |
| 484 | .family = PF_INET6, | 484 | .family = PF_INET6, |
| 485 | .owner = THIS_MODULE, | 485 | .owner = THIS_MODULE, |
| 486 | .release = inet6_release, | 486 | .release = inet6_release, |
| 487 | .bind = inet6_bind, | 487 | .bind = inet6_bind, |
| 488 | .connect = inet_dgram_connect, /* ok */ | 488 | .connect = inet_dgram_connect, /* ok */ |
| 489 | .socketpair = sock_no_socketpair, /* a do nothing */ | 489 | .socketpair = sock_no_socketpair, /* a do nothing */ |
| 490 | .accept = sock_no_accept, /* a do nothing */ | 490 | .accept = sock_no_accept, /* a do nothing */ |
| 491 | .getname = inet6_getname, | 491 | .getname = inet6_getname, |
| 492 | .poll = udp_poll, /* ok */ | 492 | .poll = udp_poll, /* ok */ |
| 493 | .ioctl = inet6_ioctl, /* must change */ | 493 | .ioctl = inet6_ioctl, /* must change */ |
| 494 | .listen = sock_no_listen, /* ok */ | 494 | .listen = sock_no_listen, /* ok */ |
| 495 | .shutdown = inet_shutdown, /* ok */ | 495 | .shutdown = inet_shutdown, /* ok */ |
| 496 | .setsockopt = sock_common_setsockopt, /* ok */ | 496 | .setsockopt = sock_common_setsockopt, /* ok */ |
| 497 | .getsockopt = sock_common_getsockopt, /* ok */ | 497 | .getsockopt = sock_common_getsockopt, /* ok */ |
| 498 | .sendmsg = inet_sendmsg, /* ok */ | ||
| 499 | .recvmsg = sock_common_recvmsg, /* ok */ | ||
| 500 | .mmap = sock_no_mmap, | ||
| 501 | .sendpage = sock_no_sendpage, | ||
| 498 | #ifdef CONFIG_COMPAT | 502 | #ifdef CONFIG_COMPAT |
| 499 | .compat_setsockopt = compat_sock_common_setsockopt, | 503 | .compat_setsockopt = compat_sock_common_setsockopt, |
| 500 | .compat_getsockopt = compat_sock_common_getsockopt, | 504 | .compat_getsockopt = compat_sock_common_getsockopt, |
| 501 | #endif | 505 | #endif |
| 502 | .sendmsg = inet_sendmsg, /* ok */ | ||
| 503 | .recvmsg = sock_common_recvmsg, /* ok */ | ||
| 504 | .mmap = sock_no_mmap, | ||
| 505 | .sendpage = sock_no_sendpage, | ||
| 506 | }; | 506 | }; |
| 507 | 507 | ||
| 508 | static struct net_proto_family inet6_family_ops = { | 508 | static struct net_proto_family inet6_family_ops = { |
| @@ -513,28 +513,28 @@ static struct net_proto_family inet6_family_ops = { | |||
| 513 | 513 | ||
| 514 | /* Same as inet6_dgram_ops, sans udp_poll. */ | 514 | /* Same as inet6_dgram_ops, sans udp_poll. */ |
| 515 | static const struct proto_ops inet6_sockraw_ops = { | 515 | static const struct proto_ops inet6_sockraw_ops = { |
| 516 | .family = PF_INET6, | 516 | .family = PF_INET6, |
| 517 | .owner = THIS_MODULE, | 517 | .owner = THIS_MODULE, |
| 518 | .release = inet6_release, | 518 | .release = inet6_release, |
| 519 | .bind = inet6_bind, | 519 | .bind = inet6_bind, |
| 520 | .connect = inet_dgram_connect, /* ok */ | 520 | .connect = inet_dgram_connect, /* ok */ |
| 521 | .socketpair = sock_no_socketpair, /* a do nothing */ | 521 | .socketpair = sock_no_socketpair, /* a do nothing */ |
| 522 | .accept = sock_no_accept, /* a do nothing */ | 522 | .accept = sock_no_accept, /* a do nothing */ |
| 523 | .getname = inet6_getname, | 523 | .getname = inet6_getname, |
| 524 | .poll = datagram_poll, /* ok */ | 524 | .poll = datagram_poll, /* ok */ |
| 525 | .ioctl = inet6_ioctl, /* must change */ | 525 | .ioctl = inet6_ioctl, /* must change */ |
| 526 | .listen = sock_no_listen, /* ok */ | 526 | .listen = sock_no_listen, /* ok */ |
| 527 | .shutdown = inet_shutdown, /* ok */ | 527 | .shutdown = inet_shutdown, /* ok */ |
| 528 | .setsockopt = sock_common_setsockopt, /* ok */ | 528 | .setsockopt = sock_common_setsockopt, /* ok */ |
| 529 | .getsockopt = sock_common_getsockopt, /* ok */ | 529 | .getsockopt = sock_common_getsockopt, /* ok */ |
| 530 | .sendmsg = inet_sendmsg, /* ok */ | ||
| 531 | .recvmsg = sock_common_recvmsg, /* ok */ | ||
| 532 | .mmap = sock_no_mmap, | ||
| 533 | .sendpage = sock_no_sendpage, | ||
| 530 | #ifdef CONFIG_COMPAT | 534 | #ifdef CONFIG_COMPAT |
| 531 | .compat_setsockopt = compat_sock_common_setsockopt, | 535 | .compat_setsockopt = compat_sock_common_setsockopt, |
| 532 | .compat_getsockopt = compat_sock_common_getsockopt, | 536 | .compat_getsockopt = compat_sock_common_getsockopt, |
| 533 | #endif | 537 | #endif |
| 534 | .sendmsg = inet_sendmsg, /* ok */ | ||
| 535 | .recvmsg = sock_common_recvmsg, /* ok */ | ||
| 536 | .mmap = sock_no_mmap, | ||
| 537 | .sendpage = sock_no_sendpage, | ||
| 538 | }; | 538 | }; |
| 539 | 539 | ||
| 540 | static struct inet_protosw rawv6_protosw = { | 540 | static struct inet_protosw rawv6_protosw = { |