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/if_pppox.h | |
parent | d4b172d2ecb99edfb6afce6af8a65447af347543 (diff) | |
download | linux-stable-bcb949b8847655516ba499ca75cd8529f167e360.tar.gz linux-stable-bcb949b8847655516ba499ca75cd8529f167e360.tar.bz2 linux-stable-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/if_pppox.h')
-rw-r--r-- | include/linux/if_pppox.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h index 60e5558045c8..b5f927f59f26 100644 --- a/include/linux/if_pppox.h +++ b/include/linux/if_pppox.h @@ -20,6 +20,7 @@ #include <linux/types.h> #include <asm/byteorder.h> +#include <linux/socket.h> #include <linux/if_ether.h> #ifdef __KERNEL__ #include <linux/if.h> @@ -63,7 +64,7 @@ struct pptp_addr { #define PX_MAX_PROTO 3 struct sockaddr_pppox { - sa_family_t sa_family; /* address family, AF_PPPOX */ + __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */ unsigned int sa_protocol; /* protocol identifier */ union { struct pppoe_addr pppoe; @@ -77,7 +78,7 @@ struct sockaddr_pppox { * type instead. */ struct sockaddr_pppol2tp { - sa_family_t sa_family; /* address family, AF_PPPOX */ + __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */ unsigned int sa_protocol; /* protocol identifier */ struct pppol2tp_addr pppol2tp; } __attribute__((packed)); @@ -86,7 +87,7 @@ struct sockaddr_pppol2tp { * bits. So we need a different sockaddr structure. */ struct sockaddr_pppol2tpv3 { - sa_family_t sa_family; /* address family, AF_PPPOX */ + __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */ unsigned int sa_protocol; /* protocol identifier */ struct pppol2tpv3_addr pppol2tp; } __attribute__((packed)); |