diff options
| author | dd <dd@wx.tnyzeq.icu> | 2024-08-12 12:00:11 +0200 |
|---|---|---|
| committer | dd <dd@wx.tnyzeq.icu> | 2024-08-12 12:00:11 +0200 |
| commit | eb4f54e535434f720772f6eb7ee7c37208af1c37 (patch) | |
| tree | 5a8be452354db2412ab841ba20e100718e98588e /packages/linux-kernel | |
| parent | af54c1eb013395917ace8600a6b5539cbf361931 (diff) | |
| parent | c75174bb4a22305211791946437bf0b4080ade2f (diff) | |
| download | vyos-build-eb4f54e535434f720772f6eb7ee7c37208af1c37.tar.gz vyos-build-eb4f54e535434f720772f6eb7ee7c37208af1c37.zip | |
Merge branch 'vyos:current' into current
Diffstat (limited to 'packages/linux-kernel')
| -rw-r--r-- | packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch | 6 |
1 files changed, 3 insertions, 3 deletions
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 index 9d10ec7e..bedcec6e 100644 --- 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,10 +100,10 @@ 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; @@ -111,7 +111,7 @@ index 9dfbda164e8c..2786c8ea451a 100644 } 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, }, |