From 9db35b68ef2e1b0005aaf7d83b4b933999566c4b Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Tue, 21 Jan 2014 12:49:54 +0100 Subject: [PATCH] include: can.h: add typedef for __kernel_sa_family_t to make headers self-contained This patch adds the typedef for __kernel_sa_family_t that was introduced in Linux v3.1-rc2 (commit 6602a4b net: Make userland include of netlink.h more sane) in . It must be duplicated here to make the CAN headers self-contained. Signed-off-by: Marc Kleine-Budde --- include/linux/can.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/include/linux/can.h b/include/linux/can.h index 5802cb3..c44a331 100644 --- a/include/linux/can.h +++ b/include/linux/can.h @@ -122,8 +122,13 @@ struct canfd_frame { #define SOL_CAN_BASE 100 -// typedef unsigned short __kernel_sa_family_t; -// introduced in Linux 3.2 commit 6602a4baf4d1a73cc4685a39ef859e1c5ddf654c +/* + * This typedef was introduced in Linux v3.1-rc2 + * (commit 6602a4b net: Make userland include of netlink.h more sane) + * in . It must be duplicated here to make the CAN + * headers self-contained. + */ +typedef unsigned short __kernel_sa_family_t; /** * struct sockaddr_can - the sockaddr structure for CAN sockets @@ -132,8 +137,7 @@ struct canfd_frame { * @can_addr: protocol specific address information */ struct sockaddr_can { - sa_family_t can_family; -// __kernel_sa_family_t can_family; + __kernel_sa_family_t can_family; int can_ifindex; union { /* transport protocol class address information (e.g. ISOTP) */ -- 2.7.4