diff options
Diffstat (limited to 'include/linux/llc.h')
-rw-r--r-- | include/linux/llc.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/linux/llc.h b/include/linux/llc.h index ad7074ba81af..a2418ae13ee9 100644 --- a/include/linux/llc.h +++ b/include/linux/llc.h | |||
@@ -12,16 +12,20 @@ | |||
12 | * | 12 | * |
13 | * See the GNU General Public License for more details. | 13 | * See the GNU General Public License for more details. |
14 | */ | 14 | */ |
15 | |||
16 | #include <linux/socket.h> | ||
17 | |||
15 | #define __LLC_SOCK_SIZE__ 16 /* sizeof(sockaddr_llc), word align. */ | 18 | #define __LLC_SOCK_SIZE__ 16 /* sizeof(sockaddr_llc), word align. */ |
16 | struct sockaddr_llc { | 19 | struct sockaddr_llc { |
17 | sa_family_t sllc_family; /* AF_LLC */ | 20 | __kernel_sa_family_t sllc_family; /* AF_LLC */ |
18 | sa_family_t sllc_arphrd; /* ARPHRD_ETHER */ | 21 | __kernel_sa_family_t sllc_arphrd; /* ARPHRD_ETHER */ |
19 | unsigned char sllc_test; | 22 | unsigned char sllc_test; |
20 | unsigned char sllc_xid; | 23 | unsigned char sllc_xid; |
21 | unsigned char sllc_ua; /* UA data, only for SOCK_STREAM. */ | 24 | unsigned char sllc_ua; /* UA data, only for SOCK_STREAM. */ |
22 | unsigned char sllc_sap; | 25 | unsigned char sllc_sap; |
23 | unsigned char sllc_mac[IFHWADDRLEN]; | 26 | unsigned char sllc_mac[IFHWADDRLEN]; |
24 | unsigned char __pad[__LLC_SOCK_SIZE__ - sizeof(sa_family_t) * 2 - | 27 | unsigned char __pad[__LLC_SOCK_SIZE__ - |
28 | sizeof(__kernel_sa_family_t) * 2 - | ||
25 | sizeof(unsigned char) * 4 - IFHWADDRLEN]; | 29 | sizeof(unsigned char) * 4 - IFHWADDRLEN]; |
26 | }; | 30 | }; |
27 | 31 | ||