Merge pull request #920 from c-po/kernel-6.6.79

Kernel: T5887: update Linux Kernel to v6.6.79
vyos · Feb 25, 2025 · fcf2615 · fcf2615
2 parents c6bf02f + e9017a5
commit fcf2615
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/data/defaults.toml b/data/defaults.toml
@@ -14,7 +14,7 @@ vyos_mirror = "https://packages.vyos.net/repositories/current"
 vyos_branch = "current"
 release_train = "current"
 
-kernel_version = "6.6.77"
+kernel_version = "6.6.79"
 kernel_flavor = "vyos"
 bootloaders = "syslinux,grub-efi"
 

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
@@ -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)