drm/rockchip: add DRM_RENDER_ALLOW

[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 dccd621d6377e8ecf0df54d4ccef87f8e400c086..63828a5870f1cec1d39939bf237f24b2750320b1 100644 (file)
--- a/include/linux/if_pppox.h
+++ b/include/linux/if_pppox.h
@@ -19,6 +19,7 @@
 #include <linux/netdevice.h>
 #include <linux/ppp_channel.h>
 #include <linux/skbuff.h>
+#include <linux/workqueue.h>
 #include <uapi/linux/if_pppox.h>
 
 static inline struct pppoe_hdr *pppoe_hdr(const struct sk_buff *skb)
@@ -32,6 +33,7 @@ struct pppoe_opt {
        struct pppoe_addr       pa;       /* what this socket is bound to*/
        struct sockaddr_pppox   relay;    /* what socket data will be
                                             relayed to (PPPoE relaying) */
+       struct work_struct      padt_work;/* Work item for handling PADT */
 };
 
 struct pptp_opt {
@@ -56,7 +58,7 @@ struct pppopns_opt {
        __u16           remote;
        __u32           recv_sequence;
        __u32           xmit_sequence;
-       void            (*data_ready)(struct sock *sk_raw, int length);
+       void            (*data_ready)(struct sock *sk_raw);
        int             (*backlog_rcv)(struct sock *sk_raw, struct sk_buff *skb);
 };
 
@@ -93,7 +95,7 @@ static inline struct sock *sk_pppox(struct pppox_sock *po)
 struct module;
 
 struct pppox_proto {
-       int             (*create)(struct net *net, struct socket *sock);
+       int             (*create)(struct net *net, struct socket *sock, int kern);
        int             (*ioctl)(struct socket *sock, unsigned int cmd,
                                 unsigned long arg);
        struct module   *owner;