diff options
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 @@ | |||
20 | #include <linux/types.h> | 20 | #include <linux/types.h> |
21 | #include <asm/byteorder.h> | 21 | #include <asm/byteorder.h> |
22 | 22 | ||
23 | #include <linux/socket.h> | ||
23 | #include <linux/if_ether.h> | 24 | #include <linux/if_ether.h> |
24 | #ifdef __KERNEL__ | 25 | #ifdef __KERNEL__ |
25 | #include <linux/if.h> | 26 | #include <linux/if.h> |
@@ -63,7 +64,7 @@ struct pptp_addr { | |||
63 | #define PX_MAX_PROTO 3 | 64 | #define PX_MAX_PROTO 3 |
64 | 65 | ||
65 | struct sockaddr_pppox { | 66 | struct sockaddr_pppox { |
66 | sa_family_t sa_family; /* address family, AF_PPPOX */ | 67 | __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */ |
67 | unsigned int sa_protocol; /* protocol identifier */ | 68 | unsigned int sa_protocol; /* protocol identifier */ |
68 | union { | 69 | union { |
69 | struct pppoe_addr pppoe; | 70 | struct pppoe_addr pppoe; |
@@ -77,7 +78,7 @@ struct sockaddr_pppox { | |||
77 | * type instead. | 78 | * type instead. |
78 | */ | 79 | */ |
79 | struct sockaddr_pppol2tp { | 80 | struct sockaddr_pppol2tp { |
80 | sa_family_t sa_family; /* address family, AF_PPPOX */ | 81 | __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */ |
81 | unsigned int sa_protocol; /* protocol identifier */ | 82 | unsigned int sa_protocol; /* protocol identifier */ |
82 | struct pppol2tp_addr pppol2tp; | 83 | struct pppol2tp_addr pppol2tp; |
83 | } __attribute__((packed)); | 84 | } __attribute__((packed)); |
@@ -86,7 +87,7 @@ struct sockaddr_pppol2tp { | |||
86 | * bits. So we need a different sockaddr structure. | 87 | * bits. So we need a different sockaddr structure. |
87 | */ | 88 | */ |
88 | struct sockaddr_pppol2tpv3 { | 89 | struct sockaddr_pppol2tpv3 { |
89 | sa_family_t sa_family; /* address family, AF_PPPOX */ | 90 | __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */ |
90 | unsigned int sa_protocol; /* protocol identifier */ | 91 | unsigned int sa_protocol; /* protocol identifier */ |
91 | struct pppol2tpv3_addr pppol2tp; | 92 | struct pppol2tpv3_addr pppol2tp; |
92 | } __attribute__((packed)); | 93 | } __attribute__((packed)); |