Merge tag 'v3.10.80' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / include / linux / if_pppox.h

diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
index aff7ad8a4ea3cdea45daca2049a7b83dc8151cc3..dccd621d6377e8ecf0df54d4ccef87f8e400c086 100644 (file)
--- a/include/linux/if_pppox.h
+++ b/include/linux/if_pppox.h
@@ -41,6 +41,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 {
@@ -51,6 +70,8 @@ struct pppox_sock {
        union {
                struct pppoe_opt pppoe;
                struct pptp_opt  pptp;
+               struct pppolac_opt lac;
+               struct pppopns_opt pns;
        } proto;
        __be16                  num;
 };