1 files changed, 26 insertions, 1 deletions

diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
index 397921b09ef..999ccd3fff3 100644
--- a/include/linux/if_pppox.h
+++ b/include/linux/if_pppox.h
@@ -27,6 +27,8 @@
 #include <linux/ppp_channel.h>
 #endif /* __KERNEL__ */
 #include <linux/if_pppol2tp.h>
+#include <linux/if_pppolac.h>
+#include <linux/if_pppopns.h>
 
 /* For user-space programs to pick up these definitions
  * which they wouldn't get otherwise without defining __KERNEL__
@@ -60,7 +62,9 @@ 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_PROTO_OPNS  4
+#define PX_MAX_PROTO   5
 
 struct sockaddr_pppox {
         sa_family_t     sa_family;            /* address family, AF_PPPOX */
@@ -167,6 +171,25 @@ struct pptp_opt {
         u32 seq_sent, seq_recv;
         int ppp_flags;
 };
+
+struct pppolac_opt {
+        __u32           local;
+        __u32           remote;
+        __u32           recv_sequence;
+        __u32           xmit_sequence;
+        atomic_t        sequencing;
+        int             (*backlog_rcv)(struct sock *sk_udp, struct sk_buff *skb);
+};
+
+struct pppopns_opt {
+        __u16           local;
+        __u16           remote;
+        __u32           recv_sequence;
+        __u32           xmit_sequence;
+        void            (*data_ready)(struct sock *sk_raw, int length);
+        int             (*backlog_rcv)(struct sock *sk_raw, struct sk_buff *skb);
+};
+
 #include <net/sock.h>
 
 struct pppox_sock {
@@ -177,6 +200,8 @@ struct pppox_sock {
         union {
                 struct pppoe_opt pppoe;
                 struct pptp_opt  pptp;
+                struct pppolac_opt lac;
+                struct pppopns_opt pns;
         } proto;
         __be16                  num;
 };