diff options
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 249ef6c88959..9e85c0416109 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -1217,21 +1217,21 @@ int tcp_v4_tw_remember_stamp(struct inet_timewait_sock *tw) | |||
1217 | } | 1217 | } |
1218 | 1218 | ||
1219 | struct inet_connection_sock_af_ops ipv4_specific = { | 1219 | struct inet_connection_sock_af_ops ipv4_specific = { |
1220 | .queue_xmit = ip_queue_xmit, | 1220 | .queue_xmit = ip_queue_xmit, |
1221 | .send_check = tcp_v4_send_check, | 1221 | .send_check = tcp_v4_send_check, |
1222 | .rebuild_header = inet_sk_rebuild_header, | 1222 | .rebuild_header = inet_sk_rebuild_header, |
1223 | .conn_request = tcp_v4_conn_request, | 1223 | .conn_request = tcp_v4_conn_request, |
1224 | .syn_recv_sock = tcp_v4_syn_recv_sock, | 1224 | .syn_recv_sock = tcp_v4_syn_recv_sock, |
1225 | .remember_stamp = tcp_v4_remember_stamp, | 1225 | .remember_stamp = tcp_v4_remember_stamp, |
1226 | .net_header_len = sizeof(struct iphdr), | 1226 | .net_header_len = sizeof(struct iphdr), |
1227 | .setsockopt = ip_setsockopt, | 1227 | .setsockopt = ip_setsockopt, |
1228 | .getsockopt = ip_getsockopt, | 1228 | .getsockopt = ip_getsockopt, |
1229 | .addr2sockaddr = inet_csk_addr2sockaddr, | ||
1230 | .sockaddr_len = sizeof(struct sockaddr_in), | ||
1229 | #ifdef CONFIG_COMPAT | 1231 | #ifdef CONFIG_COMPAT |
1230 | .compat_setsockopt = compat_ip_setsockopt, | 1232 | .compat_setsockopt = compat_ip_setsockopt, |
1231 | .compat_getsockopt = compat_ip_getsockopt, | 1233 | .compat_getsockopt = compat_ip_getsockopt, |
1232 | #endif | 1234 | #endif |
1233 | .addr2sockaddr = inet_csk_addr2sockaddr, | ||
1234 | .sockaddr_len = sizeof(struct sockaddr_in), | ||
1235 | }; | 1235 | }; |
1236 | 1236 | ||
1237 | /* NOTE: A lot of things set to zero explicitly by call to | 1237 | /* NOTE: A lot of things set to zero explicitly by call to |
@@ -1812,10 +1812,6 @@ struct proto tcp_prot = { | |||
1812 | .shutdown = tcp_shutdown, | 1812 | .shutdown = tcp_shutdown, |
1813 | .setsockopt = tcp_setsockopt, | 1813 | .setsockopt = tcp_setsockopt, |
1814 | .getsockopt = tcp_getsockopt, | 1814 | .getsockopt = tcp_getsockopt, |
1815 | #ifdef CONFIG_COMPAT | ||
1816 | .compat_setsockopt = compat_tcp_setsockopt, | ||
1817 | .compat_getsockopt = compat_tcp_getsockopt, | ||
1818 | #endif | ||
1819 | .sendmsg = tcp_sendmsg, | 1815 | .sendmsg = tcp_sendmsg, |
1820 | .recvmsg = tcp_recvmsg, | 1816 | .recvmsg = tcp_recvmsg, |
1821 | .backlog_rcv = tcp_v4_do_rcv, | 1817 | .backlog_rcv = tcp_v4_do_rcv, |
@@ -1834,6 +1830,10 @@ struct proto tcp_prot = { | |||
1834 | .obj_size = sizeof(struct tcp_sock), | 1830 | .obj_size = sizeof(struct tcp_sock), |
1835 | .twsk_prot = &tcp_timewait_sock_ops, | 1831 | .twsk_prot = &tcp_timewait_sock_ops, |
1836 | .rsk_prot = &tcp_request_sock_ops, | 1832 | .rsk_prot = &tcp_request_sock_ops, |
1833 | #ifdef CONFIG_COMPAT | ||
1834 | .compat_setsockopt = compat_tcp_setsockopt, | ||
1835 | .compat_getsockopt = compat_tcp_getsockopt, | ||
1836 | #endif | ||
1837 | }; | 1837 | }; |
1838 | 1838 | ||
1839 | void __init tcp_v4_init(struct net_proto_family *ops) | 1839 | void __init tcp_v4_init(struct net_proto_family *ops) |