patch-2.1.17 linux/net/unix/af_unix.c

Next file: linux/scripts/mkdep.c
Previous file: linux/net/rose/rose_route.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.16/linux/net/unix/af_unix.c linux/net/unix/af_unix.c
@@ -627,7 +627,7 @@
 			      int alen, int flags)
 {
 	struct sock *sk = sock->sk;
-	struct sockaddr_un *sun=(struct sockaddr_un*)addr;
+	struct sockaddr_un *sunaddr=(struct sockaddr_un*)addr;
 	struct sock *other;
 	unsigned hash;
 	int err;
@@ -647,11 +647,11 @@
 		return 0;
 	}
 		
-	alen = unix_mkname(sun, alen, &hash);
+	alen = unix_mkname(sunaddr, alen, &hash);
 	if (alen < 0)
 		return alen;
 
-	other=unix_find_other(sun, alen, sock->type, hash, &err);
+	other=unix_find_other(sunaddr, alen, sock->type, hash, &err);
 	if (!other)
 		return err;
 	if (!unix_may_send(sk, other))

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov