mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-13 17:28:56 +00:00
inet: Remove ->get_peer() method.
No longer used. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
b6242b9b45
commit
16d1839907
@ -43,7 +43,6 @@ struct inet_connection_sock_af_ops {
|
|||||||
struct sock *(*syn_recv_sock)(struct sock *sk, struct sk_buff *skb,
|
struct sock *(*syn_recv_sock)(struct sock *sk, struct sk_buff *skb,
|
||||||
struct request_sock *req,
|
struct request_sock *req,
|
||||||
struct dst_entry *dst);
|
struct dst_entry *dst);
|
||||||
struct inet_peer *(*get_peer)(struct sock *sk);
|
|
||||||
u16 net_header_len;
|
u16 net_header_len;
|
||||||
u16 net_frag_header_len;
|
u16 net_frag_header_len;
|
||||||
u16 sockaddr_len;
|
u16 sockaddr_len;
|
||||||
|
@ -1847,21 +1847,6 @@ do_time_wait:
|
|||||||
goto discard_it;
|
goto discard_it;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct inet_peer *tcp_v4_get_peer(struct sock *sk)
|
|
||||||
{
|
|
||||||
struct rtable *rt = (struct rtable *) __sk_dst_get(sk);
|
|
||||||
struct inet_sock *inet = inet_sk(sk);
|
|
||||||
|
|
||||||
/* If we don't have a valid cached route, or we're doing IP
|
|
||||||
* options which make the IPv4 header destination address
|
|
||||||
* different from our peer's, do not bother with this.
|
|
||||||
*/
|
|
||||||
if (!rt || inet->cork.fl.u.ip4.daddr != inet->inet_daddr)
|
|
||||||
return NULL;
|
|
||||||
return rt_get_peer_create(rt, inet->inet_daddr);
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL(tcp_v4_get_peer);
|
|
||||||
|
|
||||||
static struct timewait_sock_ops tcp_timewait_sock_ops = {
|
static struct timewait_sock_ops tcp_timewait_sock_ops = {
|
||||||
.twsk_obj_size = sizeof(struct tcp_timewait_sock),
|
.twsk_obj_size = sizeof(struct tcp_timewait_sock),
|
||||||
.twsk_unique = tcp_twsk_unique,
|
.twsk_unique = tcp_twsk_unique,
|
||||||
@ -1874,7 +1859,6 @@ const struct inet_connection_sock_af_ops ipv4_specific = {
|
|||||||
.rebuild_header = inet_sk_rebuild_header,
|
.rebuild_header = inet_sk_rebuild_header,
|
||||||
.conn_request = tcp_v4_conn_request,
|
.conn_request = tcp_v4_conn_request,
|
||||||
.syn_recv_sock = tcp_v4_syn_recv_sock,
|
.syn_recv_sock = tcp_v4_syn_recv_sock,
|
||||||
.get_peer = tcp_v4_get_peer,
|
|
||||||
.net_header_len = sizeof(struct iphdr),
|
.net_header_len = sizeof(struct iphdr),
|
||||||
.setsockopt = ip_setsockopt,
|
.setsockopt = ip_setsockopt,
|
||||||
.getsockopt = ip_getsockopt,
|
.getsockopt = ip_getsockopt,
|
||||||
|
@ -1689,20 +1689,6 @@ do_time_wait:
|
|||||||
goto discard_it;
|
goto discard_it;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct inet_peer *tcp_v6_get_peer(struct sock *sk)
|
|
||||||
{
|
|
||||||
struct rt6_info *rt = (struct rt6_info *) __sk_dst_get(sk);
|
|
||||||
struct ipv6_pinfo *np = inet6_sk(sk);
|
|
||||||
|
|
||||||
/* If we don't have a valid cached route, or we're doing IP
|
|
||||||
* options which make the IPv6 header destination address
|
|
||||||
* different from our peer's, do not bother with this.
|
|
||||||
*/
|
|
||||||
if (!rt || !ipv6_addr_equal(&np->daddr, &rt->rt6i_dst.addr))
|
|
||||||
return NULL;
|
|
||||||
return rt6_get_peer_create(rt);
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct timewait_sock_ops tcp6_timewait_sock_ops = {
|
static struct timewait_sock_ops tcp6_timewait_sock_ops = {
|
||||||
.twsk_obj_size = sizeof(struct tcp6_timewait_sock),
|
.twsk_obj_size = sizeof(struct tcp6_timewait_sock),
|
||||||
.twsk_unique = tcp_twsk_unique,
|
.twsk_unique = tcp_twsk_unique,
|
||||||
@ -1715,7 +1701,6 @@ static const struct inet_connection_sock_af_ops ipv6_specific = {
|
|||||||
.rebuild_header = inet6_sk_rebuild_header,
|
.rebuild_header = inet6_sk_rebuild_header,
|
||||||
.conn_request = tcp_v6_conn_request,
|
.conn_request = tcp_v6_conn_request,
|
||||||
.syn_recv_sock = tcp_v6_syn_recv_sock,
|
.syn_recv_sock = tcp_v6_syn_recv_sock,
|
||||||
.get_peer = tcp_v6_get_peer,
|
|
||||||
.net_header_len = sizeof(struct ipv6hdr),
|
.net_header_len = sizeof(struct ipv6hdr),
|
||||||
.net_frag_header_len = sizeof(struct frag_hdr),
|
.net_frag_header_len = sizeof(struct frag_hdr),
|
||||||
.setsockopt = ipv6_setsockopt,
|
.setsockopt = ipv6_setsockopt,
|
||||||
@ -1747,7 +1732,6 @@ static const struct inet_connection_sock_af_ops ipv6_mapped = {
|
|||||||
.rebuild_header = inet_sk_rebuild_header,
|
.rebuild_header = inet_sk_rebuild_header,
|
||||||
.conn_request = tcp_v6_conn_request,
|
.conn_request = tcp_v6_conn_request,
|
||||||
.syn_recv_sock = tcp_v6_syn_recv_sock,
|
.syn_recv_sock = tcp_v6_syn_recv_sock,
|
||||||
.get_peer = tcp_v4_get_peer,
|
|
||||||
.net_header_len = sizeof(struct iphdr),
|
.net_header_len = sizeof(struct iphdr),
|
||||||
.setsockopt = ipv6_setsockopt,
|
.setsockopt = ipv6_setsockopt,
|
||||||
.getsockopt = ipv6_getsockopt,
|
.getsockopt = ipv6_getsockopt,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user