1 files changed, 4 insertions, 3 deletions

diff --git a/include/linux/l2tp.h b/include/linux/l2tp.h
index 4bdb31df8e72..e77d7f9bb246 100644
--- a/include/linux/l2tp.h
+++ b/include/linux/l2tp.h
@@ -8,8 +8,8 @@
 #define _LINUX_L2TP_H_
 
 #include <linux/types.h>
-#ifdef __KERNEL__
 #include <linux/socket.h>
+#ifdef __KERNEL__
 #include <linux/in.h>
 #else
 #include <netinet/in.h>
@@ -26,14 +26,15 @@
 #define __SOCK_SIZE__   16              /* sizeof(struct sockaddr)      */
 struct sockaddr_l2tpip {
         /* The first fields must match struct sockaddr_in */
-        sa_family_t     l2tp_family;    /* AF_INET */
+        __kernel_sa_family_t l2tp_family; /* AF_INET */
         __be16          l2tp_unused;    /* INET port number (unused) */
         struct in_addr  l2tp_addr;      /* Internet address */
 
         __u32           l2tp_conn_id;   /* Connection ID of tunnel */
 
         /* Pad to size of `struct sockaddr'. */
-        unsigned char   __pad[sizeof(struct sockaddr) - sizeof(sa_family_t) -
+        unsigned char   __pad[sizeof(struct sockaddr) -
+                              sizeof(__kernel_sa_family_t) -
                               sizeof(__be16) - sizeof(struct in_addr) -
                               sizeof(__u32)];
 };