diff options
| author | Dmitry Kozlov <xeb@mail.ru> | 2018-03-20 12:50:09 +0300 |
|---|---|---|
| committer | Dmitry Kozlov <xeb@mail.ru> | 2018-03-20 12:50:09 +0300 |
| commit | e2dcd0051424c67756f6a7339d329897f1af713b (patch) | |
| tree | 5a0d1116dc4bdd0fe3a61ffe45ccfe0fd078a5d2 /drivers | |
| parent | 60f540289b52ffd46b5680ece7753ba0c97cfb22 (diff) | |
| parent | 83e289bbef77421b1692d41cd95a83c75a7eb655 (diff) | |
| download | accel-ppp-e2dcd0051424c67756f6a7339d329897f1af713b.tar.gz accel-ppp-e2dcd0051424c67756f6a7339d329897f1af713b.zip | |
Merge branch 'master' of https://github.com/xebd/accel-ppp
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ipoe/ipoe.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/ipoe/ipoe.c b/drivers/ipoe/ipoe.c index 1052a1a..4951c53 100644 --- a/drivers/ipoe/ipoe.c +++ b/drivers/ipoe/ipoe.c @@ -141,8 +141,15 @@ static LIST_HEAD(ipoe_networks); static struct work_struct ipoe_queue_work; static struct sk_buff_head ipoe_queue; + + +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) +static void ipoe_start_queue_work(struct timer_list *unused); +static DEFINE_TIMER(ipoe_timer_u, ipoe_start_queue_work); +#else static void ipoe_start_queue_work(unsigned long); static DEFINE_TIMER(ipoe_timer_u, ipoe_start_queue_work, 0, 0); +#endif static struct ipoe_session *ipoe_lookup(__be32 addr); static int ipoe_do_nat(struct sk_buff *skb, __be32 new_addr, int to_peer); @@ -545,7 +552,11 @@ static int ipoe_queue_u(struct sk_buff *skb, __u32 addr) return 0; } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) +static void ipoe_start_queue_work(struct timer_list *unused) +#else static void ipoe_start_queue_work(unsigned long dummy) +#endif { schedule_work(&ipoe_queue_work); } |