Merge commit 'v3.17' into next

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:
         return newsk;
 }
 
-/* Map address, empty for v4 family */
-static void sctp_v4_addr_v4map(struct sctp_sock *sp, union sctp_addr *addr)
+static int sctp_v4_addr_to_user(struct sctp_sock *sp, union sctp_addr *addr)
 {
-        /* Empty */
+        /* No address mapping for V4 sockets */
+        return sizeof(struct sockaddr_in);
 }
 
 /* Dump the v4 addr to the seq file. */
@@ -976,7 +976,9 @@ static struct sctp_pf sctp_pf_inet = {
         .send_verify   = sctp_inet_send_verify,
         .supported_addrs = sctp_inet_supported_addrs,
         .create_accept_sk = sctp_v4_create_accept_sk,
-        .addr_v4map     = sctp_v4_addr_v4map,
+        .addr_to_user  = sctp_v4_addr_to_user,
+        .to_sk_saddr   = sctp_v4_to_sk_saddr,
+        .to_sk_daddr   = sctp_v4_to_sk_daddr,
         .af            = &sctp_af_inet
 };
 
@@ -1047,8 +1049,6 @@ static struct sctp_af sctp_af_inet = {
         .copy_addrlist     = sctp_v4_copy_addrlist,
         .from_skb          = sctp_v4_from_skb,
         .from_sk           = sctp_v4_from_sk,
-        .to_sk_saddr       = sctp_v4_to_sk_saddr,
-        .to_sk_daddr       = sctp_v4_to_sk_daddr,
         .from_addr_param   = sctp_v4_from_addr_param,
         .to_addr_param     = sctp_v4_to_addr_param,
         .cmp_addr          = sctp_v4_cmp_addr,