diff options
| author |   Ben Hutchings <ben@decadent.org.uk> | 2011-08-24 18:43:55 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2011-08-26 12:02:50 -0400 |
| commit | bcb949b8847655516ba499ca75cd8529f167e360 (patch) | |
| tree | 7e5457a45e5ddf1381bffc9cfe793504afe10696 /include/linux/phonet.h | |
| parent | headers, pppol2tp: Use __kernel_pid_t in <linux/pppol2tp.h> (diff) | |
| download | linux-dev-bcb949b8847655516ba499ca75cd8529f167e360.tar.xz linux-dev-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/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 */ |