Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

[firefly-linux-kernel-4.4.55.git] / include / linux / if_pppox.h

diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
index 1251169e21a299bbf6691e6ec60c863d13d94453..63828a5870f1cec1d39939bf237f24b2750320b1 100644 (file)
--- a/include/linux/if_pppox.h
+++ b/include/linux/if_pppox.h
@@ -45,19 +45,21 @@ struct pptp_opt {
 };
 
 struct pppolac_opt {
-       __u32   local;
-       __u32   remote;
-       __u16   sequence;
-       __u8    sequencing;
-       int     (*backlog_rcv)(struct sock *sk_udp, struct sk_buff *skb);
+       __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   sequence;
-       void    (*data_ready)(struct sock *sk_raw, int length);
-       int     (*backlog_rcv)(struct sock *sk_raw, struct sk_buff *skb);
+       __u16           local;
+       __u16           remote;
+       __u32           recv_sequence;
+       __u32           xmit_sequence;
+       void            (*data_ready)(struct sock *sk_raw);
+       int             (*backlog_rcv)(struct sock *sk_raw, struct sk_buff *skb);
 };
 
 #include <net/sock.h>