net/af_iucv: use DECLARE_SOCKADDR to cast from sockaddr

[linux-2.6-microblaze.git] / net / iucv / af_iucv.c

diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index 047238f..882f028 100644 (file)
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -587,7 +587,7 @@ static void __iucv_auto_name(struct iucv_sock *iucv)
 static int iucv_sock_bind(struct socket *sock, struct sockaddr *addr,
                          int addr_len)
 {
-       struct sockaddr_iucv *sa = (struct sockaddr_iucv *) addr;
+       DECLARE_SOCKADDR(struct sockaddr_iucv *, sa, addr);
        char uid[sizeof(sa->siucv_user_id)];
        struct sock *sk = sock->sk;
        struct iucv_sock *iucv;
@@ -691,7 +691,7 @@ static int iucv_sock_autobind(struct sock *sk)
 
 static int afiucv_path_connect(struct socket *sock, struct sockaddr *addr)
 {
-       struct sockaddr_iucv *sa = (struct sockaddr_iucv *) addr;
+       DECLARE_SOCKADDR(struct sockaddr_iucv *, sa, addr);
        struct sock *sk = sock->sk;
        struct iucv_sock *iucv = iucv_sk(sk);
        unsigned char user_data[16];
@@ -738,7 +738,7 @@ done:
 static int iucv_sock_connect(struct socket *sock, struct sockaddr *addr,
                             int alen, int flags)
 {
-       struct sockaddr_iucv *sa = (struct sockaddr_iucv *) addr;
+       DECLARE_SOCKADDR(struct sockaddr_iucv *, sa, addr);
        struct sock *sk = sock->sk;
        struct iucv_sock *iucv = iucv_sk(sk);
        int err;
@@ -874,7 +874,7 @@ done:
 static int iucv_sock_getname(struct socket *sock, struct sockaddr *addr,
                             int peer)
 {
-       struct sockaddr_iucv *siucv = (struct sockaddr_iucv *) addr;
+       DECLARE_SOCKADDR(struct sockaddr_iucv *, siucv, addr);
        struct sock *sk = sock->sk;
        struct iucv_sock *iucv = iucv_sk(sk);
 
@@ -1645,7 +1645,7 @@ static int iucv_callback_connreq(struct iucv_path *path,
        }
 
        /* Create the new socket */
-       nsk = iucv_sock_alloc(NULL, sk->sk_type, GFP_ATOMIC, 0);
+       nsk = iucv_sock_alloc(NULL, sk->sk_protocol, GFP_ATOMIC, 0);
        if (!nsk) {
                err = pr_iucv->path_sever(path, user_data);
                iucv_path_free(path);
@@ -1851,7 +1851,7 @@ static int afiucv_hs_callback_syn(struct sock *sk, struct sk_buff *skb)
                goto out;
        }
 
-       nsk = iucv_sock_alloc(NULL, sk->sk_type, GFP_ATOMIC, 0);
+       nsk = iucv_sock_alloc(NULL, sk->sk_protocol, GFP_ATOMIC, 0);
        bh_lock_sock(sk);
        if ((sk->sk_state != IUCV_LISTEN) ||
            sk_acceptq_is_full(sk) ||