diff options
| author | Ben Hutchings | 2011-08-24 20:43:55 +0200 |
|---|---|---|
| committer | David S. Miller | 2011-08-26 18:02:50 +0200 |
| commit | bcb949b8847655516ba499ca75cd8529f167e360 (patch) | |
| tree | 7e5457a45e5ddf1381bffc9cfe793504afe10696 /include/linux/x25.h | |
| parent | headers, pppol2tp: Use __kernel_pid_t in <linux/pppol2tp.h> (diff) | |
| download | kernel-qcow2-linux-bcb949b8847655516ba499ca75cd8529f167e360.tar.gz kernel-qcow2-linux-bcb949b8847655516ba499ca75cd8529f167e360.tar.xz kernel-qcow2-linux-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/x25.h')
| -rw-r--r-- | include/linux/x25.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/x25.h b/include/linux/x25.h index 6450a7f12074..810cce6737ea 100644 --- a/include/linux/x25.h +++ b/include/linux/x25.h @@ -12,6 +12,7 @@ #define X25_KERNEL_H #include <linux/types.h> +#include <linux/socket.h> #define SIOCX25GSUBSCRIP (SIOCPROTOPRIVATE + 0) #define SIOCX25SSUBSCRIP (SIOCPROTOPRIVATE + 1) @@ -57,7 +58,7 @@ struct x25_address { * Linux X.25 Address structure, used for bind, and connect mostly. */ struct sockaddr_x25 { - sa_family_t sx25_family; /* Must be AF_X25 */ + __kernel_sa_family_t sx25_family; /* Must be AF_X25 */ struct x25_address sx25_addr; /* X.121 Address */ }; |