Merge pull request #733 from c-po/kernel-T5887

Kernel: T5887: update Linux Kernel to v6.6.45
vyos · Aug 12, 2024 · c75174b · c75174b
2 parents e40abc1 + faa6453
commit c75174b
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://rolling-packages.vyos.net/current"
 vyos_branch = "current"
 release_train = "current"
 
-kernel_version = "6.6.43"
+kernel_version = "6.6.45"
 bootloaders = "syslinux,grub-efi"
 
 squashfs_compression_type = "xz -Xbcj x86 -b 256k -always-use-fragments -no-recovery"

diff --git a/packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch b/packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch
@@ -100,18 +100,18 @@ index bc74f131fe4d..9cdd5b50f9b2 100644
  };
 
 diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
-index 9dfbda164e8c..2786c8ea451a 100644
+index a9358c796a81..7e39846f556b 100644
 --- a/net/ipv6/addrconf.c
 +++ b/net/ipv6/addrconf.c
-@@ -5656,6 +5656,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf,
+@@ -5657,6 +5657,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf,
  array[DEVCONF_NDISC_EVICT_NOCARRIER] = cnf->ndisc_evict_nocarrier;
  array[DEVCONF_ACCEPT_UNTRACKED_NA] = cnf->accept_untracked_na;
  array[DEVCONF_ACCEPT_RA_MIN_LFT] = cnf->accept_ra_min_lft;
 + array[DEVCONF_LINK_FILTER] = cnf->link_filter;
  }
 
  static inline size_t inet6_ifla6_size(void)
-@@ -7085,6 +7086,13 @@ static const struct ctl_table addrconf_sysctl[] = {
+@@ -7086,6 +7087,13 @@ static const struct ctl_table addrconf_sysctl[] = {
  .extra1 = (void *)SYSCTL_ZERO,
  .extra2 = (void *)SYSCTL_ONE,
  },