diff options
| author | Denys Fedoryshchenko <denys.f@collabora.com> | 2025-06-30 22:36:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-30 22:36:58 +0300 |
| commit | e06f5b835eb3ef28a2489ca903bc410175225c11 (patch) | |
| tree | ae015a7a7cf0e52f3c5d0eed68042b0f81aa0ae2 /drivers/ipoe | |
| parent | 5c8ad5a98c79c256b7f85a118cccc5c788b9265d (diff) | |
| parent | df7250cc903daadf416a1021bceaaa7026e331f3 (diff) | |
| download | accel-ppp-master.tar.gz accel-ppp-master.zip | |
Add build fixes
Diffstat (limited to 'drivers/ipoe')
| -rw-r--r-- | drivers/ipoe/ipoe.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/ipoe/ipoe.c b/drivers/ipoe/ipoe.c index c6b88620..14b6416a 100644 --- a/drivers/ipoe/ipoe.c +++ b/drivers/ipoe/ipoe.c @@ -702,7 +702,11 @@ nl_err: if (!list_empty(&ipoe_list2_u)) mod_timer(&ipoe_timer_u, jiffies + IPOE_TIMEOUT_U * HZ); else +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,2,0) del_timer(&ipoe_timer_u); +#else + timer_delete(&ipoe_timer_u); +#endif } static struct ipoe_session *ipoe_lookup(__be32 addr) @@ -1105,7 +1109,9 @@ static void ipoe_netdev_setup(struct net_device *dev) dev->iflink = 0; #endif dev->addr_len = ETH_ALEN; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,12,0) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,15,0) + dev->netns_immutable = true; +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(6,12,0) dev->netns_local = true; #else dev->features |= NETIF_F_NETNS_LOCAL; @@ -1988,8 +1994,11 @@ static void __exit ipoe_fini(void) flush_work(&ipoe_queue_work); skb_queue_purge(&ipoe_queue); - +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,2,0) del_timer(&ipoe_timer_u); +#else + timer_delete(&ipoe_timer_u); +#endif for (i = 0; i <= IPOE_HASH_BITS; i++) rcu_assign_pointer(ipoe_list[i].next, &ipoe_list[i]); |