summaryrefslogtreecommitdiff
path: root/include/linux/caif
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2011-08-24 22:43:55 +0400
committerDavid S. Miller <davem@davemloft.net>2011-08-26 20:02:50 +0400
commitbcb949b8847655516ba499ca75cd8529f167e360 (patch)
tree7e5457a45e5ddf1381bffc9cfe793504afe10696 /include/linux/caif
parentd4b172d2ecb99edfb6afce6af8a65447af347543 (diff)
downloadlinux-bcb949b8847655516ba499ca75cd8529f167e360.tar.xz
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/caif')
-rw-r--r--include/linux/caif/caif_socket.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/caif/caif_socket.h b/include/linux/caif/caif_socket.h
index d9cb19b7cff7..3f3bac6af7bc 100644
--- a/include/linux/caif/caif_socket.h
+++ b/include/linux/caif/caif_socket.h
@@ -9,12 +9,7 @@
#define _LINUX_CAIF_SOCKET_H
#include <linux/types.h>
-
-#ifdef __KERNEL__
#include <linux/socket.h>
-#else
-#include <sys/socket.h>
-#endif
/**
* enum caif_link_selector - Physical Link Selection.
@@ -144,7 +139,7 @@ enum caif_debug_service {
* CAIF Channel. It defines the service to connect to on the modem.
*/
struct sockaddr_caif {
- sa_family_t family;
+ __kernel_sa_family_t family;
union {
struct {
__u8 type; /* type: enum caif_at_type */