diff options
author | Ben Hutchings <ben@decadent.org.uk> | 2011-08-24 14:43:55 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-08-26 12:02:50 -0400 |
commit | bcb949b8847655516ba499ca75cd8529f167e360 (patch) | |
tree | 7e5457a45e5ddf1381bffc9cfe793504afe10696 /include/linux/phonet.h | |
parent | d4b172d2ecb99edfb6afce6af8a65447af347543 (diff) |
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/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 @@ | |||
24 | #define LINUX_PHONET_H | 24 | #define LINUX_PHONET_H |
25 | 25 | ||
26 | #include <linux/types.h> | 26 | #include <linux/types.h> |
27 | #include <linux/socket.h> | ||
27 | 28 | ||
28 | /* Automatic protocol selection */ | 29 | /* Automatic protocol selection */ |
29 | #define PN_PROTO_TRANSPORT 0 | 30 | #define PN_PROTO_TRANSPORT 0 |
@@ -96,11 +97,11 @@ struct phonetmsg { | |||
96 | 97 | ||
97 | /* Phonet socket address structure */ | 98 | /* Phonet socket address structure */ |
98 | struct sockaddr_pn { | 99 | struct sockaddr_pn { |
99 | sa_family_t spn_family; | 100 | __kernel_sa_family_t spn_family; |
100 | __u8 spn_obj; | 101 | __u8 spn_obj; |
101 | __u8 spn_dev; | 102 | __u8 spn_dev; |
102 | __u8 spn_resource; | 103 | __u8 spn_resource; |
103 | __u8 spn_zero[sizeof(struct sockaddr) - sizeof(sa_family_t) - 3]; | 104 | __u8 spn_zero[sizeof(struct sockaddr) - sizeof(__kernel_sa_family_t) - 3]; |
104 | } __attribute__((packed)); | 105 | } __attribute__((packed)); |
105 | 106 | ||
106 | /* Well known address */ | 107 | /* Well known address */ |