aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-11-29 16:37:14 -0500
committerDavid S. Miller <davem@davemloft.net>2010-11-30 15:28:06 -0500
commit3f419d2d487821093ee46e898b5f8747f9edc9cd (patch)
treea3f7731eb0706c5ae6d0f4ec004ba0d08d7f951b /net/ipv6
parentb3419363808f2481b24a817f491878e1795db4c7 (diff)
inet: Turn ->remember_stamp into ->get_peer in connection AF ops.
Then we can make a completely generic tcp_remember_stamp() that uses ->get_peer() as a helper, minimizing the AF specific code and minimizing the eventual code duplication when we implement the ipv6 side of TW recycling. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/tcp_ipv6.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 7e41e2cbb85e..e394d0029d8d 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1818,10 +1818,10 @@ do_time_wait:
1818 goto discard_it; 1818 goto discard_it;
1819} 1819}
1820 1820
1821static int tcp_v6_remember_stamp(struct sock *sk) 1821struct inet_peer *tcp_v6_get_peer(struct sock *sk, bool *release_it)
1822{ 1822{
1823 /* Alas, not yet... */ 1823 /* Alas, not yet... */
1824 return 0; 1824 return NULL;
1825} 1825}
1826 1826
1827static const struct inet_connection_sock_af_ops ipv6_specific = { 1827static const struct inet_connection_sock_af_ops ipv6_specific = {
@@ -1830,7 +1830,7 @@ static const struct inet_connection_sock_af_ops ipv6_specific = {
1830 .rebuild_header = inet6_sk_rebuild_header, 1830 .rebuild_header = inet6_sk_rebuild_header,
1831 .conn_request = tcp_v6_conn_request, 1831 .conn_request = tcp_v6_conn_request,
1832 .syn_recv_sock = tcp_v6_syn_recv_sock, 1832 .syn_recv_sock = tcp_v6_syn_recv_sock,
1833 .remember_stamp = tcp_v6_remember_stamp, 1833 .get_peer = tcp_v6_get_peer,
1834 .net_header_len = sizeof(struct ipv6hdr), 1834 .net_header_len = sizeof(struct ipv6hdr),
1835 .setsockopt = ipv6_setsockopt, 1835 .setsockopt = ipv6_setsockopt,
1836 .getsockopt = ipv6_getsockopt, 1836 .getsockopt = ipv6_getsockopt,
@@ -1862,7 +1862,7 @@ static const struct inet_connection_sock_af_ops ipv6_mapped = {
1862 .rebuild_header = inet_sk_rebuild_header, 1862 .rebuild_header = inet_sk_rebuild_header,
1863 .conn_request = tcp_v6_conn_request, 1863 .conn_request = tcp_v6_conn_request,
1864 .syn_recv_sock = tcp_v6_syn_recv_sock, 1864 .syn_recv_sock = tcp_v6_syn_recv_sock,
1865 .remember_stamp = tcp_v4_remember_stamp, 1865 .get_peer = tcp_v4_get_peer,
1866 .net_header_len = sizeof(struct iphdr), 1866 .net_header_len = sizeof(struct iphdr),
1867 .setsockopt = ipv6_setsockopt, 1867 .setsockopt = ipv6_setsockopt,
1868 .getsockopt = ipv6_getsockopt, 1868 .getsockopt = ipv6_getsockopt,