Skip to content

Commit 97c2a87

Browse files
committed
Kernel: T9067: Update Linux Kernel to 6.18.41
Upgrade rolling release Kernel version. Changelogs: * 6.18.41 https://lwn.net/Articles/1086227/ * 6.18.40 https://lwn.net/Articles/1084923/ * 6.18.39 https://lwn.net/Articles/1083464/
1 parent 8d1faab commit 97c2a87

2 files changed

Lines changed: 6 additions & 6 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/rolling"
1414
vyos_branch = "rolling"
1515
release_train = "rolling"
1616

17-
kernel_version = "6.18.38"
17+
kernel_version = "6.18.41"
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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ index 7a637e87005f..982c76d0b0ab 100644
4949
- 1 - Allows you to have multiple network interfaces on the same
5050
subnet, and have the ARPs for each interface be answered
5151
diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h
52-
index dccbeb25f701..b16f70e491d6 100644
52+
index 6032eea2539a..b3ecf2a418af 100644
5353
--- a/include/linux/inetdevice.h
5454
+++ b/include/linux/inetdevice.h
5555
@@ -139,6 +139,7 @@ static inline void ipv4_devconf_setall(struct in_device *in_dev)
@@ -109,18 +109,18 @@ index 942a887bf089..e6df2bfc4e40 100644
109109
};
110110

111111
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
112-
index b2e1328371d3..769d4e1f5cbf 100644
112+
index c98b1b919f18..e7eb01ce30d1 100644
113113
--- a/net/ipv6/addrconf.c
114114
+++ b/net/ipv6/addrconf.c
115-
@@ -5718,6 +5718,7 @@ static void ipv6_store_devconf(const struct ipv6_devconf *cnf,
115+
@@ -5731,6 +5731,7 @@ static void ipv6_store_devconf(const struct ipv6_devconf *cnf,
116116
READ_ONCE(cnf->accept_untracked_na);
117117
array[DEVCONF_ACCEPT_RA_MIN_LFT] = READ_ONCE(cnf->accept_ra_min_lft);
118118
array[DEVCONF_FORCE_FORWARDING] = READ_ONCE(cnf->force_forwarding);
119119
+ array[DEVCONF_LINK_FILTER] = READ_ONCE(cnf->link_filter);
120120
}
121121

122122
static inline size_t inet6_ifla6_size(void)
123-
@@ -7253,6 +7254,13 @@ static const struct ctl_table addrconf_sysctl[] = {
123+
@@ -7274,6 +7275,13 @@ static const struct ctl_table addrconf_sysctl[] = {
124124
.extra1 = (void *)SYSCTL_ZERO,
125125
.extra2 = (void *)SYSCTL_ONE,
126126
},
@@ -135,7 +135,7 @@ index b2e1328371d3..769d4e1f5cbf 100644
135135
.procname = "ioam6_id",
136136
.data = &ipv6_devconf.ioam6_id,
137137
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
138-
index f89220929c4e..8f92ef14d884 100644
138+
index ef66a3c86feb..4a1de714e3a9 100644
139139
--- a/net/ipv6/route.c
140140
+++ b/net/ipv6/route.c
141141
@@ -717,6 +717,14 @@ static inline void rt6_probe(struct fib6_nh *fib6_nh)

0 commit comments

Comments
 (0)