Skip to content

Commit defe8e5

Browse files
authored
Merge pull request #988 from c-po/kernel-6.6.96
Kernel: T5887: update Linux Kernel to v6.6.96
2 parents c9b8053 + 9012ce9 commit defe8e5

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

data/defaults.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ vyos_mirror = "https://packages.vyos.net/repositories/current"
1414
vyos_branch = "current"
1515
release_train = "current"
1616

17-
kernel_version = "6.6.93"
17+
kernel_version = "6.6.96"
1818
kernel_flavor = "vyos"
1919
bootloaders = "syslinux,grub-efi"
2020

scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,18 +101,18 @@ index c33b1ecc591e..7576d51cd16d 100644
101101
};
102102

103103
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
104-
index bb9add46e382..20346b1dd103 100644
104+
index 231fa4dc6cde..8d8a8ee9c4fe 100644
105105
--- a/net/ipv6/addrconf.c
106106
+++ b/net/ipv6/addrconf.c
107-
@@ -5674,6 +5674,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf,
107+
@@ -5677,6 +5677,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf,
108108
array[DEVCONF_NDISC_EVICT_NOCARRIER] = cnf->ndisc_evict_nocarrier;
109109
array[DEVCONF_ACCEPT_UNTRACKED_NA] = cnf->accept_untracked_na;
110110
array[DEVCONF_ACCEPT_RA_MIN_LFT] = cnf->accept_ra_min_lft;
111111
+ array[DEVCONF_LINK_FILTER] = cnf->link_filter;
112112
}
113113

114114
static inline size_t inet6_ifla6_size(void)
115-
@@ -7116,6 +7117,13 @@ static const struct ctl_table addrconf_sysctl[] = {
115+
@@ -7119,6 +7120,13 @@ static const struct ctl_table addrconf_sysctl[] = {
116116
.extra1 = (void *)SYSCTL_ZERO,
117117
.extra2 = (void *)SYSCTL_ONE,
118118
},

0 commit comments

Comments
 (0)