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/dccp/ipv4.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/dccp/ipv4.c')
-rw-r--r-- | net/dccp/ipv4.c | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index 8a33c8498d9c..29047995c695 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c | |||
@@ -986,20 +986,20 @@ do_time_wait: | |||
986 | } | 986 | } |
987 | 987 | ||
988 | static struct inet_connection_sock_af_ops dccp_ipv4_af_ops = { | 988 | static struct inet_connection_sock_af_ops dccp_ipv4_af_ops = { |
989 | .queue_xmit = ip_queue_xmit, | 989 | .queue_xmit = ip_queue_xmit, |
990 | .send_check = dccp_v4_send_check, | 990 | .send_check = dccp_v4_send_check, |
991 | .rebuild_header = inet_sk_rebuild_header, | 991 | .rebuild_header = inet_sk_rebuild_header, |
992 | .conn_request = dccp_v4_conn_request, | 992 | .conn_request = dccp_v4_conn_request, |
993 | .syn_recv_sock = dccp_v4_request_recv_sock, | 993 | .syn_recv_sock = dccp_v4_request_recv_sock, |
994 | .net_header_len = sizeof(struct iphdr), | 994 | .net_header_len = sizeof(struct iphdr), |
995 | .setsockopt = ip_setsockopt, | 995 | .setsockopt = ip_setsockopt, |
996 | .getsockopt = ip_getsockopt, | 996 | .getsockopt = ip_getsockopt, |
997 | .addr2sockaddr = inet_csk_addr2sockaddr, | ||
998 | .sockaddr_len = sizeof(struct sockaddr_in), | ||
997 | #ifdef CONFIG_COMPAT | 999 | #ifdef CONFIG_COMPAT |
998 | .compat_setsockopt = compat_ip_setsockopt, | 1000 | .compat_setsockopt = compat_ip_setsockopt, |
999 | .compat_getsockopt = compat_ip_getsockopt, | 1001 | .compat_getsockopt = compat_ip_getsockopt, |
1000 | #endif | 1002 | #endif |
1001 | .addr2sockaddr = inet_csk_addr2sockaddr, | ||
1002 | .sockaddr_len = sizeof(struct sockaddr_in), | ||
1003 | }; | 1003 | }; |
1004 | 1004 | ||
1005 | static int dccp_v4_init_sock(struct sock *sk) | 1005 | static int dccp_v4_init_sock(struct sock *sk) |
@@ -1044,10 +1044,6 @@ static struct proto dccp_v4_prot = { | |||
1044 | .init = dccp_v4_init_sock, | 1044 | .init = dccp_v4_init_sock, |
1045 | .setsockopt = dccp_setsockopt, | 1045 | .setsockopt = dccp_setsockopt, |
1046 | .getsockopt = dccp_getsockopt, | 1046 | .getsockopt = dccp_getsockopt, |
1047 | #ifdef CONFIG_COMPAT | ||
1048 | .compat_setsockopt = compat_dccp_setsockopt, | ||
1049 | .compat_getsockopt = compat_dccp_getsockopt, | ||
1050 | #endif | ||
1051 | .sendmsg = dccp_sendmsg, | 1047 | .sendmsg = dccp_sendmsg, |
1052 | .recvmsg = dccp_recvmsg, | 1048 | .recvmsg = dccp_recvmsg, |
1053 | .backlog_rcv = dccp_v4_do_rcv, | 1049 | .backlog_rcv = dccp_v4_do_rcv, |
@@ -1062,6 +1058,10 @@ static struct proto dccp_v4_prot = { | |||
1062 | .obj_size = sizeof(struct dccp_sock), | 1058 | .obj_size = sizeof(struct dccp_sock), |
1063 | .rsk_prot = &dccp_request_sock_ops, | 1059 | .rsk_prot = &dccp_request_sock_ops, |
1064 | .twsk_prot = &dccp_timewait_sock_ops, | 1060 | .twsk_prot = &dccp_timewait_sock_ops, |
1061 | #ifdef CONFIG_COMPAT | ||
1062 | .compat_setsockopt = compat_dccp_setsockopt, | ||
1063 | .compat_getsockopt = compat_dccp_getsockopt, | ||
1064 | #endif | ||
1065 | }; | 1065 | }; |
1066 | 1066 | ||
1067 | static struct net_protocol dccp_v4_protocol = { | 1067 | static struct net_protocol dccp_v4_protocol = { |
@@ -1071,30 +1071,30 @@ static struct net_protocol dccp_v4_protocol = { | |||
1071 | }; | 1071 | }; |
1072 | 1072 | ||
1073 | static const struct proto_ops inet_dccp_ops = { | 1073 | static const struct proto_ops inet_dccp_ops = { |
1074 | .family = PF_INET, | 1074 | .family = PF_INET, |
1075 | .owner = THIS_MODULE, | 1075 | .owner = THIS_MODULE, |
1076 | .release = inet_release, | 1076 | .release = inet_release, |
1077 | .bind = inet_bind, | 1077 | .bind = inet_bind, |
1078 | .connect = inet_stream_connect, | 1078 | .connect = inet_stream_connect, |
1079 | .socketpair = sock_no_socketpair, | 1079 | .socketpair = sock_no_socketpair, |
1080 | .accept = inet_accept, | 1080 | .accept = inet_accept, |
1081 | .getname = inet_getname, | 1081 | .getname = inet_getname, |
1082 | /* FIXME: work on tcp_poll to rename it to inet_csk_poll */ | 1082 | /* FIXME: work on tcp_poll to rename it to inet_csk_poll */ |
1083 | .poll = dccp_poll, | 1083 | .poll = dccp_poll, |
1084 | .ioctl = inet_ioctl, | 1084 | .ioctl = inet_ioctl, |
1085 | /* FIXME: work on inet_listen to rename it to sock_common_listen */ | 1085 | /* FIXME: work on inet_listen to rename it to sock_common_listen */ |
1086 | .listen = inet_dccp_listen, | 1086 | .listen = inet_dccp_listen, |
1087 | .shutdown = inet_shutdown, | 1087 | .shutdown = inet_shutdown, |
1088 | .setsockopt = sock_common_setsockopt, | 1088 | .setsockopt = sock_common_setsockopt, |
1089 | .getsockopt = sock_common_getsockopt, | 1089 | .getsockopt = sock_common_getsockopt, |
1090 | .sendmsg = inet_sendmsg, | ||
1091 | .recvmsg = sock_common_recvmsg, | ||
1092 | .mmap = sock_no_mmap, | ||
1093 | .sendpage = sock_no_sendpage, | ||
1090 | #ifdef CONFIG_COMPAT | 1094 | #ifdef CONFIG_COMPAT |
1091 | .compat_setsockopt = compat_sock_common_setsockopt, | 1095 | .compat_setsockopt = compat_sock_common_setsockopt, |
1092 | .compat_getsockopt = compat_sock_common_getsockopt, | 1096 | .compat_getsockopt = compat_sock_common_getsockopt, |
1093 | #endif | 1097 | #endif |
1094 | .sendmsg = inet_sendmsg, | ||
1095 | .recvmsg = sock_common_recvmsg, | ||
1096 | .mmap = sock_no_mmap, | ||
1097 | .sendpage = sock_no_sendpage, | ||
1098 | }; | 1098 | }; |
1099 | 1099 | ||
1100 | static struct inet_protosw dccp_v4_protosw = { | 1100 | static struct inet_protosw dccp_v4_protosw = { |