diff options
Diffstat (limited to 'net/sctp/protocol.c')
-rw-r--r-- | net/sctp/protocol.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index 6789d785e698..6240834f4b95 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c | |||
@@ -576,10 +576,10 @@ out: | |||
576 | return newsk; | 576 | return newsk; |
577 | } | 577 | } |
578 | 578 | ||
579 | /* Map address, empty for v4 family */ | 579 | static int sctp_v4_addr_to_user(struct sctp_sock *sp, union sctp_addr *addr) |
580 | static void sctp_v4_addr_v4map(struct sctp_sock *sp, union sctp_addr *addr) | ||
581 | { | 580 | { |
582 | /* Empty */ | 581 | /* No address mapping for V4 sockets */ |
582 | return sizeof(struct sockaddr_in); | ||
583 | } | 583 | } |
584 | 584 | ||
585 | /* Dump the v4 addr to the seq file. */ | 585 | /* Dump the v4 addr to the seq file. */ |
@@ -976,7 +976,9 @@ static struct sctp_pf sctp_pf_inet = { | |||
976 | .send_verify = sctp_inet_send_verify, | 976 | .send_verify = sctp_inet_send_verify, |
977 | .supported_addrs = sctp_inet_supported_addrs, | 977 | .supported_addrs = sctp_inet_supported_addrs, |
978 | .create_accept_sk = sctp_v4_create_accept_sk, | 978 | .create_accept_sk = sctp_v4_create_accept_sk, |
979 | .addr_v4map = sctp_v4_addr_v4map, | 979 | .addr_to_user = sctp_v4_addr_to_user, |
980 | .to_sk_saddr = sctp_v4_to_sk_saddr, | ||
981 | .to_sk_daddr = sctp_v4_to_sk_daddr, | ||
980 | .af = &sctp_af_inet | 982 | .af = &sctp_af_inet |
981 | }; | 983 | }; |
982 | 984 | ||
@@ -1047,8 +1049,6 @@ static struct sctp_af sctp_af_inet = { | |||
1047 | .copy_addrlist = sctp_v4_copy_addrlist, | 1049 | .copy_addrlist = sctp_v4_copy_addrlist, |
1048 | .from_skb = sctp_v4_from_skb, | 1050 | .from_skb = sctp_v4_from_skb, |
1049 | .from_sk = sctp_v4_from_sk, | 1051 | .from_sk = sctp_v4_from_sk, |
1050 | .to_sk_saddr = sctp_v4_to_sk_saddr, | ||
1051 | .to_sk_daddr = sctp_v4_to_sk_daddr, | ||
1052 | .from_addr_param = sctp_v4_from_addr_param, | 1052 | .from_addr_param = sctp_v4_from_addr_param, |
1053 | .to_addr_param = sctp_v4_to_addr_param, | 1053 | .to_addr_param = sctp_v4_to_addr_param, |
1054 | .cmp_addr = sctp_v4_cmp_addr, | 1054 | .cmp_addr = sctp_v4_cmp_addr, |