summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorViacheslav Hletenko <v.gletenko@vyos.io>2025-02-25 18:57:16 +0200
committerGitHub <noreply@github.com>2025-02-25 18:57:16 +0200
commitfcf261561a31669177b286551a406d01c5148be9 (patch)
tree9574ab228d70947243d2728c474c132f7ce71d88 /scripts
parentc6bf02f56872e719c8cddb05678666f3f40ba9f8 (diff)
parente9017a53e1578121589dc7b26d9a46356718bbb6 (diff)
downloadvyos-build-fcf261561a31669177b286551a406d01c5148be9.tar.gz
vyos-build-fcf261561a31669177b286551a406d01c5148be9.zip
Merge pull request #920 from c-po/kernel-6.6.79
Kernel: T5887: update Linux Kernel to v6.6.79
Diffstat (limited to 'scripts')
-rw-r--r--scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch b/scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch
index 40a5a2f4..7bd0b04b 100644
--- a/scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch
+++ b/scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch
@@ -88,10 +88,10 @@ index cf592d7b630f..e8915701aa73 100644
};
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
-index 4822f68edbf0..ba4304144d37 100644
+index c33b1ecc591e..7576d51cd16d 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
-@@ -2608,6 +2608,7 @@ static struct devinet_sysctl_table {
+@@ -2609,6 +2609,7 @@ static struct devinet_sysctl_table {
"route_localnet"),
DEVINET_SYSCTL_FLUSHING_ENTRY(DROP_UNICAST_IN_L2_MULTICAST,
"drop_unicast_in_l2_multicast"),
@@ -126,7 +126,7 @@ index 8360939acf85..b13832a08d28 100644
.procname = "ioam6_id",
.data = &ipv6_devconf.ioam6_id,
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
-index fc5c53462025..9c9c9d51a12d 100644
+index 5715d54f3d0b..e88971b512ba 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -682,6 +682,14 @@ static inline void rt6_probe(struct fib6_nh *fib6_nh)