--- zzzz-none-000/linux-3.10.107/net/atm/common.h 2017-06-27 09:49:32.000000000 +0000 +++ scorpion-7490-727/linux-3.10.107/net/atm/common.h 2021-02-04 17:41:59.000000000 +0000 @@ -10,13 +10,12 @@ #include /* for poll_table */ -int vcc_create(struct net *net, struct socket *sock, int protocol, int family); +int vcc_create(struct net *net, struct socket *sock, int protocol, int family, int kern); int vcc_release(struct socket *sock); int vcc_connect(struct socket *sock, int itf, short vpi, int vci); -int vcc_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, - size_t size, int flags); -int vcc_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *m, - size_t total_len); +int vcc_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, + int flags); +int vcc_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len); unsigned int vcc_poll(struct file *file, struct socket *sock, poll_table *wait); int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg); int vcc_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg); @@ -52,5 +51,15 @@ int svc_change_qos(struct atm_vcc *vcc,struct atm_qos *qos); void atm_dev_release_vccs(struct atm_dev *dev); +#ifdef CONFIG_LTQ_OAM +int ifx_push_oam(struct atm_vcc *atmvcc, void *cell); +#endif +#if defined(CONFIG_VRX318_DATAPATH) || defined(CONFIG_VRX318_DATAPATH_MODULE) || \ + defined(CONFIG_VRX518_TC) || defined(CONFIG_VRX518_TC_MODULE) || IS_ENABLED(CONFIG_VRX518) +extern void (*atm_hook_mpoa_setup)(struct atm_vcc *, int, int, struct net_device *); +#else +extern void (*ppa_hook_mpoa_setup)(struct atm_vcc *, int, int); +#endif + #endif