diff options
| author | James Morris <jmorris@namei.org> | 2011-11-16 12:39:48 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-11-16 12:39:48 +1100 |
| commit | 24942c8e5cc8696064ee207ff29d4cf21f70dafc (patch) | |
| tree | 08a8221eb72ec3da7746d7d76f6f5915ce77cde7 /include/linux/phonet.h | |
| parent | e163bc8e4a0cd1cdffadb58253f7651201722d56 (diff) | |
| parent | ff0ff78068dd8a962358dbbdafa9d6f24540d3e5 (diff) | |
| download | linux-stable-24942c8e5cc8696064ee207ff29d4cf21f70dafc.tar.gz linux-stable-24942c8e5cc8696064ee207ff29d4cf21f70dafc.tar.bz2 linux-stable-24942c8e5cc8696064ee207ff29d4cf21f70dafc.zip | |
Merge branch 'master'; commit 'v3.2-rc2' into next
Diffstat (limited to 'include/linux/phonet.h')
| -rw-r--r-- | include/linux/phonet.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/phonet.h b/include/linux/phonet.h index 6fb13841db45..f53a4167c5f4 100644 --- a/include/linux/phonet.h +++ b/include/linux/phonet.h @@ -24,6 +24,7 @@ #define LINUX_PHONET_H #include <linux/types.h> +#include <linux/socket.h> /* Automatic protocol selection */ #define PN_PROTO_TRANSPORT 0 @@ -96,11 +97,11 @@ struct phonetmsg { /* Phonet socket address structure */ struct sockaddr_pn { - sa_family_t spn_family; + __kernel_sa_family_t spn_family; __u8 spn_obj; __u8 spn_dev; __u8 spn_resource; - __u8 spn_zero[sizeof(struct sockaddr) - sizeof(sa_family_t) - 3]; + __u8 spn_zero[sizeof(struct sockaddr) - sizeof(__kernel_sa_family_t) - 3]; } __attribute__((packed)); /* Well known address */ |