summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Fedoryshchenko <denys.f@collabora.com>2025-06-30 18:28:17 +0300
committerDenys Fedoryshchenko <denys.f@collabora.com>2025-06-30 18:45:26 +0300
commitdf7250cc903daadf416a1021bceaaa7026e331f3 (patch)
treeae015a7a7cf0e52f3c5d0eed68042b0f81aa0ae2
parent942aff027f6ee38739638a679baf31820da2c8c1 (diff)
downloadaccel-ppp-df7250cc903daadf416a1021bceaaa7026e331f3.tar.gz
accel-ppp-df7250cc903daadf416a1021bceaaa7026e331f3.zip
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 <denys.f@collabora.com>
-rw-r--r--drivers/ipoe/ipoe.c4
1 files changed, 3 insertions, 1 deletions
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;