summaryrefslogtreecommitdiff
path: root/include/linux/un.h
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2011-08-24 18:43:55 +0000
committerDavid S. Miller <davem@davemloft.net>2011-08-26 12:02:50 -0400
commitbcb949b8847655516ba499ca75cd8529f167e360 (patch)
tree7e5457a45e5ddf1381bffc9cfe793504afe10696 /include/linux/un.h
parentd4b172d2ecb99edfb6afce6af8a65447af347543 (diff)
downloadlinux-3.10-bcb949b8847655516ba499ca75cd8529f167e360.tar.gz
linux-3.10-bcb949b8847655516ba499ca75cd8529f167e360.tar.bz2
linux-3.10-bcb949b8847655516ba499ca75cd8529f167e360.zip
headers, net: Use __kernel_sa_family_t in more definitions shared with userland
Complete the work started with commit 6602a4baf4d1a73cc4685a39ef859e1c5ddf654c ('net: Make userland include of netlink.h more sane'). Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/un.h')
-rw-r--r--include/linux/un.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/un.h b/include/linux/un.h
index 45561c564b8..3ed3e46c1b1 100644
--- a/include/linux/un.h
+++ b/include/linux/un.h
@@ -1,10 +1,12 @@
#ifndef _LINUX_UN_H
#define _LINUX_UN_H
+#include <linux/socket.h>
+
#define UNIX_PATH_MAX 108
struct sockaddr_un {
- sa_family_t sun_family; /* AF_UNIX */
+ __kernel_sa_family_t sun_family; /* AF_UNIX */
char sun_path[UNIX_PATH_MAX]; /* pathname */
};