Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / include / net / sctp / structs.h

diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 9069f8d..c6f6d60 100644 (file)
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -603,10 +603,6 @@ struct sctp_af {
                                         int saddr);
        void            (*from_sk)      (union sctp_addr *,
                                         struct sock *sk);
-       void            (*to_sk_saddr)  (union sctp_addr *,
-                                        struct sock *sk);
-       void            (*to_sk_daddr)  (union sctp_addr *,
-                                        struct sock *sk);
        void            (*from_addr_param) (union sctp_addr *,
                                            union sctp_addr_param *,
                                            __be16 port, int iif);
@@ -647,7 +643,9 @@ struct sctp_pf {
        int  (*supported_addrs)(const struct sctp_sock *, __be16 *);
        struct sock *(*create_accept_sk) (struct sock *sk,
                                          struct sctp_association *asoc);
-       void (*addr_v4map) (struct sctp_sock *, union sctp_addr *);
+       int (*addr_to_user)(struct sctp_sock *sk, union sctp_addr *addr);
+       void (*to_sk_saddr)(union sctp_addr *, struct sock *sk);
+       void (*to_sk_daddr)(union sctp_addr *, struct sock *sk);
        struct sctp_af *af;
 };