diff options
| author | Denys Fedoryshchenko <denys@visp.net.lb> | 2018-03-20 05:23:08 +0200 |
|---|---|---|
| committer | Denys Fedoryshchenko <denys@visp.net.lb> | 2018-03-20 05:23:08 +0200 |
| commit | 395b8c1b299992efb3fd96443011b20f0dd5ddd9 (patch) | |
| tree | 24d5c1f2209043659063b8231de4d16bb2f52dc3 | |
| parent | 99fc79fd173f911596c0324046dd7515cf1dd7e7 (diff) | |
| download | accel-ppp-395b8c1b299992efb3fd96443011b20f0dd5ddd9.tar.gz accel-ppp-395b8c1b299992efb3fd96443011b20f0dd5ddd9.zip | |
Compiling fix for 4.15+ kernels
| -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 17aad5be..2eacac9a 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); } |