1 files changed, 30 insertions, 34 deletions

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 2f8975e0150..301eee726b0 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1298,22 +1298,21 @@ static int tcp_v6_remember_stamp(struct sock *sk)
 }
 
 static struct inet_connection_sock_af_ops ipv6_specific = {
-        .queue_xmit     =       inet6_csk_xmit,
-        .send_check     =       tcp_v6_send_check,
-        .rebuild_header =       inet6_sk_rebuild_header,
-        .conn_request   =       tcp_v6_conn_request,
-        .syn_recv_sock  =       tcp_v6_syn_recv_sock,
-        .remember_stamp =       tcp_v6_remember_stamp,
-        .net_header_len =       sizeof(struct ipv6hdr),
-
-        .setsockopt     =       ipv6_setsockopt,
-        .getsockopt     =       ipv6_getsockopt,
+        .queue_xmit        = inet6_csk_xmit,
+        .send_check        = tcp_v6_send_check,
+        .rebuild_header    = inet6_sk_rebuild_header,
+        .conn_request      = tcp_v6_conn_request,
+        .syn_recv_sock     = tcp_v6_syn_recv_sock,
+        .remember_stamp    = tcp_v6_remember_stamp,
+        .net_header_len    = sizeof(struct ipv6hdr),
+        .setsockopt        = ipv6_setsockopt,
+        .getsockopt        = ipv6_getsockopt,
+        .addr2sockaddr     = inet6_csk_addr2sockaddr,
+        .sockaddr_len      = sizeof(struct sockaddr_in6),
 #ifdef CONFIG_COMPAT
-        .compat_setsockopt      = compat_ipv6_setsockopt,
-        .compat_getsockopt      = compat_ipv6_getsockopt,
+        .compat_setsockopt = compat_ipv6_setsockopt,
+        .compat_getsockopt = compat_ipv6_getsockopt,
 #endif
-        .addr2sockaddr  =       inet6_csk_addr2sockaddr,
-        .sockaddr_len   =       sizeof(struct sockaddr_in6)
 };
 
 /*
@@ -1321,26 +1320,23 @@ static struct inet_connection_sock_af_ops ipv6_specific = {
  */
 
 static struct inet_connection_sock_af_ops ipv6_mapped = {
-        .queue_xmit     =       ip_queue_xmit,
-        .send_check     =       tcp_v4_send_check,
-        .rebuild_header =       inet_sk_rebuild_header,
-        .conn_request   =       tcp_v6_conn_request,
-        .syn_recv_sock  =       tcp_v6_syn_recv_sock,
-        .remember_stamp =       tcp_v4_remember_stamp,
-        .net_header_len =       sizeof(struct iphdr),
-
-        .setsockopt     =       ipv6_setsockopt,
-        .getsockopt     =       ipv6_getsockopt,
+        .queue_xmit        = ip_queue_xmit,
+        .send_check        = tcp_v4_send_check,
+        .rebuild_header    = inet_sk_rebuild_header,
+        .conn_request      = tcp_v6_conn_request,
+        .syn_recv_sock     = tcp_v6_syn_recv_sock,
+        .remember_stamp    = tcp_v4_remember_stamp,
+        .net_header_len    = sizeof(struct iphdr),
+        .setsockopt        = ipv6_setsockopt,
+        .getsockopt        = ipv6_getsockopt,
+        .addr2sockaddr     = inet6_csk_addr2sockaddr,
+        .sockaddr_len      = sizeof(struct sockaddr_in6),
 #ifdef CONFIG_COMPAT
-        .compat_setsockopt      = compat_ipv6_setsockopt,
-        .compat_getsockopt      = compat_ipv6_getsockopt,
+        .compat_setsockopt = compat_ipv6_setsockopt,
+        .compat_getsockopt = compat_ipv6_getsockopt,
 #endif
-        .addr2sockaddr  =       inet6_csk_addr2sockaddr,
-        .sockaddr_len   =       sizeof(struct sockaddr_in6)
 };
 
-
-
 /* NOTE: A lot of things set to zero explicitly by call to
  *       sk_alloc() so need not be done here.
  */
@@ -1574,10 +1570,6 @@ struct proto tcpv6_prot = {
         .shutdown               = tcp_shutdown,
         .setsockopt             = tcp_setsockopt,
         .getsockopt             = tcp_getsockopt,
-#ifdef CONFIG_COMPAT
-        .compat_setsockopt      = compat_tcp_setsockopt,
-        .compat_getsockopt      = compat_tcp_getsockopt,
-#endif
         .sendmsg                = tcp_sendmsg,
         .recvmsg                = tcp_recvmsg,
         .backlog_rcv            = tcp_v6_do_rcv,
@@ -1596,6 +1588,10 @@ struct proto tcpv6_prot = {
         .obj_size               = sizeof(struct tcp6_sock),
         .twsk_prot              = &tcp6_timewait_sock_ops,
         .rsk_prot               = &tcp6_request_sock_ops,
+#ifdef CONFIG_COMPAT
+        .compat_setsockopt      = compat_tcp_setsockopt,
+        .compat_getsockopt      = compat_tcp_getsockopt,
+#endif
 };
 
 static struct inet6_protocol tcpv6_protocol = {