From d8506760e7713664f47d15629f3d4476d3b8e850 Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@openvz.org>
Date: Sun, 8 Nov 2009 05:51:19 +0000
Subject: [PATCH] --- yaml --- r: 171485 b: refs/heads/master c:
 13cfa97bef0f1172879f98307ac716acf3e9cea9 h: refs/heads/master i:   171483:
 dc4d62a6d2f2fbe19f1c7ff20ddac90ab8253ae7 v: v3

---
 [refs]                         | 2 +-
 trunk/net/netlink/af_netlink.c | 2 +-
 trunk/net/packet/af_packet.c   | 2 +-
 trunk/net/unix/af_unix.c       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4080a50769e0..cbf9a88ddc8a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37e8273cd30592d3a82bcb70cbb1bdc4eaeb6b71
+refs/heads/master: 13cfa97bef0f1172879f98307ac716acf3e9cea9
diff --git a/trunk/net/netlink/af_netlink.c b/trunk/net/netlink/af_netlink.c
index aea805c98da3..f30d596dbc58 100644
--- a/trunk/net/netlink/af_netlink.c
+++ b/trunk/net/netlink/af_netlink.c
@@ -708,7 +708,7 @@ static int netlink_getname(struct socket *sock, struct sockaddr *addr,
 {
 	struct sock *sk = sock->sk;
 	struct netlink_sock *nlk = nlk_sk(sk);
-	struct sockaddr_nl *nladdr = (struct sockaddr_nl *)addr;
+	DECLARE_SOCKADDR(struct sockaddr_nl *, nladdr, addr);
 
 	nladdr->nl_family = AF_NETLINK;
 	nladdr->nl_pad = 0;
diff --git a/trunk/net/packet/af_packet.c b/trunk/net/packet/af_packet.c
index 3304caa65347..c620bd9ae3de 100644
--- a/trunk/net/packet/af_packet.c
+++ b/trunk/net/packet/af_packet.c
@@ -1537,7 +1537,7 @@ static int packet_getname(struct socket *sock, struct sockaddr *uaddr,
 	struct net_device *dev;
 	struct sock *sk = sock->sk;
 	struct packet_sock *po = pkt_sk(sk);
-	struct sockaddr_ll *sll = (struct sockaddr_ll *)uaddr;
+	DECLARE_SOCKADDR(struct sockaddr_ll *, sll, uaddr);
 
 	if (peer)
 		return -EOPNOTSUPP;
diff --git a/trunk/net/unix/af_unix.c b/trunk/net/unix/af_unix.c
index 178d3af2a605..7553ea6edd8f 100644
--- a/trunk/net/unix/af_unix.c
+++ b/trunk/net/unix/af_unix.c
@@ -1259,7 +1259,7 @@ static int unix_getname(struct socket *sock, struct sockaddr *uaddr, int *uaddr_
 {
 	struct sock *sk = sock->sk;
 	struct unix_sock *u;
-	struct sockaddr_un *sunaddr = (struct sockaddr_un *)uaddr;
+	DECLARE_SOCKADDR(struct sockaddr_un *, sunaddr, uaddr);
 	int err = 0;
 
 	if (peer) {