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/irda.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/irda.h')
| -rw-r--r-- | include/linux/irda.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/linux/irda.h b/include/linux/irda.h index 00bdad0e8515..a014c3252311 100644 --- a/include/linux/irda.h +++ b/include/linux/irda.h @@ -26,12 +26,9 @@ #define KERNEL_IRDA_H #include <linux/types.h> +#include <linux/socket.h> -/* Please do *not* add any #include in this file, this file is - * included as-is in user space. - * Please fix the calling file to properly included needed files before - * this one, or preferably to include <net/irda/irda.h> instead. - * Jean II */ +/* Note that this file is shared with user space. */ /* Hint bit positions for first hint byte */ #define HINT_PNP 0x01 @@ -125,7 +122,7 @@ enum { #define LSAP_ANY 0xff struct sockaddr_irda { - sa_family_t sir_family; /* AF_IRDA */ + __kernel_sa_family_t sir_family; /* AF_IRDA */ __u8 sir_lsap_sel; /* LSAP selector */ __u32 sir_addr; /* Device address */ char sir_name[25]; /* Usually <service>:IrDA:TinyTP */ |