From 942aff027f6ee38739638a679baf31820da2c8c1 Mon Sep 17 00:00:00 2001 From: Denys Fedoryshchenko Date: Mon, 30 Jun 2025 18:13:38 +0300 Subject: ipoe: Fix del_timer / timer_delete rename MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit del_timer() was renamed to timer_delete() by commit bb663f0f3c396c6d (“timers: Rename del_timer() to timer_delete()”) authored by Thomas Gleixner on 23 Nov 2022, merged via the timers/core branch and included in the Linux 6.2-rc1 merge window; the change therefore reached users with the Linux 6.2 final release on 19 Feb 2023. (The legacy inline wrappers del_timer() / del_timer_sync() stayed in place for compatibility until they were dropped by the tree-wide cleanup commit 8fa7292fee5c on 5 Apr 2025, merged for Linux 6.15-rc1.) Signed-off-by: Denys Fedoryshchenko --- drivers/ipoe/ipoe.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/ipoe/ipoe.c b/drivers/ipoe/ipoe.c index c6b88620..8875eac8 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) @@ -1988,8 +1992,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]); -- cgit v1.2.3 From df7250cc903daadf416a1021bceaaa7026e331f3 Mon Sep 17 00:00:00 2001 From: Denys Fedoryshchenko Date: Mon, 30 Jun 2025 18:28:17 +0300 Subject: ipoe: NETIF_F_NETNS_LOCAL got added back, fix NETIF_F_NETNS_LOCAL existed in <=6.11, then converted to dev->netns_local, and then renamed to netns_immutable in 0c493da86374dffff7505e67289ad75b21f5b301. This commit address this properly. Signed-off-by: Denys Fedoryshchenko --- drivers/ipoe/ipoe.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/ipoe/ipoe.c b/drivers/ipoe/ipoe.c index 8875eac8..14b6416a 100644 --- a/drivers/ipoe/ipoe.c +++ b/drivers/ipoe/ipoe.c @@ -1109,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; -- cgit v1.2.3