aboutsummaryrefslogtreecommitdiff
path: root/include/uapi
diff options
context:
space:
mode:
authorChia-chi Yeh <chiachi@android.com>2009-05-08 04:02:40 +0800
committerColin Cross <ccross@android.com>2014-03-19 13:07:26 -0700
commit52c46e9afacbcdec587d44f598ef407ff0fe1169 (patch)
treecada42c6bc53e512fb67d13b6d182a7a1df0dde3 /include/uapi
parent16586560b6b0c6035f02c5a73929029b248cf348 (diff)
net: add PPP on L2TP Access Concentrator (PPPoLAC) driver.
Change-Id: I3ae3ee7520951ae24269db0ef2898c6455cf6bcc Signed-off-by: Chia-chi Yeh <chiachi@android.com> ppolac: dont include px_proto define in if_pppolac.h Change-Id: I55bc9cf91ea0e9e8f7bf5d6e241d188e1269343a Signed-off-by: Dima Zavin <dima@android.com>
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/linux/if_pppox.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/uapi/linux/if_pppox.h b/include/uapi/linux/if_pppox.h
index e128769331b..8cf7e1c8534 100644
--- a/include/uapi/linux/if_pppox.h
+++ b/include/uapi/linux/if_pppox.h
@@ -23,6 +23,7 @@
#include <linux/socket.h>
#include <linux/if_ether.h>
#include <linux/if_pppol2tp.h>
+#include <linux/if_pppolac.h>
/* For user-space programs to pick up these definitions
* which they wouldn't get otherwise without defining __KERNEL__
@@ -56,7 +57,8 @@ struct pptp_addr {
#define PX_PROTO_OE 0 /* Currently just PPPoE */
#define PX_PROTO_OL2TP 1 /* Now L2TP also */
#define PX_PROTO_PPTP 2
-#define PX_MAX_PROTO 3
+#define PX_PROTO_OLAC 3
+#define PX_MAX_PROTO 4
struct sockaddr_pppox {
__kernel_sa_family_t sa_family; /* address family, AF_PPPOX */