Skip to content

Commit c2cf1b4

Browse files
github-actions[bot]github-actions[bot]
committed
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: kernel: update 5.19 new hashsum dl kernel: update 5.19 new hashsum dl kernel: add linux 5.19 stable release support rockchip: 5.18: diable ntfs option (coolsnowwolf#9875) kernel: add kmod-nvme package wolfssl: make shared again
2 parents 61a4caa + afd4fa3 commit c2cf1b4

File tree

140 files changed

+30268
-4
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+30268
-4
lines changed

‎include/kernel-5.19

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
LINUX_VERSION-5.19 =
2+
LINUX_KERNEL_HASH-5.19 = ff240c579b9ee1affc318917de07394fc1c3bb49dac25ec1287370c2e15005a8

‎package/kernel/linux/modules/block.mk

+23
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,29 @@ endef
508508
$(eval $(call KernelPackage,nbd))
509509

510510

511+
define KernelPackage/nvme
512+
SUBMENU:=$(BLOCK_MENU)
513+
TITLE:=NVM Express block device
514+
DEPENDS:=@PCI_SUPPORT
515+
KCONFIG:= \
516+
CONFIG_NVME_CORE \
517+
CONFIG_BLK_DEV_NVME \
518+
CONFIG_NVME_MULTIPATH=n \
519+
CONFIG_NVME_HWMON=n
520+
FILES:= \
521+
$(LINUX_DIR)/drivers/nvme/host/nvme-core.ko \
522+
$(LINUX_DIR)/drivers/nvme/host/nvme.ko
523+
AUTOLOAD:=$(call AutoLoad,30,nvme-core nvme)
524+
endef
525+
526+
define KernelPackage/nvme/description
527+
Kernel module for NVM Express solid state drives directly
528+
connected to the PCI or PCI Express bus.
529+
endef
530+
531+
$(eval $(call KernelPackage,nvme))
532+
533+
511534
define KernelPackage/scsi-core
512535
SUBMENU:=$(BLOCK_MENU)
513536
TITLE:=SCSI device support

‎package/libs/wolfssl/Config.in

-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ config WOLFSSL_ASM_CAPABLE
7272

7373
choice
7474
prompt "Hardware Acceleration"
75-
default WOLFSSL_HAS_CPU_CRYPTO if WOLFSSL_ASM_CAPABLE && !TARGET_armvirt
7675
default WOLFSSL_HAS_NO_HW
7776

7877
config WOLFSSL_HAS_NO_HW

‎package/libs/wolfssl/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ endef
6161
define Package/libwolfssl
6262
$(call Package/libwolfssl/Default)
6363
TITLE:=wolfSSL library
64-
PKGFLAGS:=nonshared
6564
MENU:=1
6665
PROVIDES:=libcyassl
6766
DEPENDS:=+WOLFSSL_HAS_DEVCRYPTO:kmod-cryptodev +WOLFSSL_HAS_AFALG:kmod-crypto-user

‎target/linux/generic/backport-5.19/001-CONFIG_INITRAMFS_PRESERVE_MTIME.patch

+75
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
--- a/init/Kconfig
2+
+++ b/init/Kconfig
3+
@@ -1380,16 +1380,6 @@ config BOOT_CONFIG_EMBED_FILE
4+
This bootconfig will be used if there is no initrd or no other
5+
bootconfig in the initrd.
6+
7+
-config INITRAMFS_PRESERVE_MTIME
8+
- bool "Preserve cpio archive mtimes in initramfs"
9+
- default y
10+
- help
11+
- Each entry in an initramfs cpio archive carries an mtime value. When
12+
- enabled, extracted cpio items take this mtime, with directory mtime
13+
- setting deferred until after creation of any child entries.
14+
-
15+
- If unsure, say Y.
16+
-
17+
choice
18+
prompt "Compiler optimization level"
19+
default CC_OPTIMIZE_FOR_PERFORMANCE
20+
--- a/init/initramfs.c
21+
+++ b/init/initramfs.c
22+
@@ -127,17 +127,15 @@ static void __init free_hash(void)
23+
}
24+
}
25+
26+
-#ifdef CONFIG_INITRAMFS_PRESERVE_MTIME
27+
-static void __init do_utime(char *filename, time64_t mtime)
28+
+static long __init do_utime(char *filename, time64_t mtime)
29+
{
30+
- struct timespec64 t[2] = { { .tv_sec = mtime }, { .tv_sec = mtime } };
31+
- init_utimes(filename, t);
32+
-}
33+
+ struct timespec64 t[2];
34+
35+
-static void __init do_utime_path(const struct path *path, time64_t mtime)
36+
-{
37+
- struct timespec64 t[2] = { { .tv_sec = mtime }, { .tv_sec = mtime } };
38+
- vfs_utimes(path, t);
39+
+ t[0].tv_sec = mtime;
40+
+ t[0].tv_nsec = 0;
41+
+ t[1].tv_sec = mtime;
42+
+ t[1].tv_nsec = 0;
43+
+ return init_utimes(filename, t);
44+
}
45+
46+
static __initdata LIST_HEAD(dir_list);
47+
@@ -170,12 +168,6 @@ static void __init dir_utime(void)
48+
kfree(de);
49+
}
50+
}
51+
-#else
52+
-static void __init do_utime(char *filename, time64_t mtime) {}
53+
-static void __init do_utime_path(const struct path *path, time64_t mtime) {}
54+
-static void __init dir_add(const char *name, time64_t mtime) {}
55+
-static void __init dir_utime(void) {}
56+
-#endif
57+
58+
static __initdata time64_t mtime;
59+
60+
@@ -407,10 +399,14 @@ static int __init do_name(void)
61+
static int __init do_copy(void)
62+
{
63+
if (byte_count >= body_len) {
64+
+ struct timespec64 t[2] = { };
65+
if (xwrite(wfile, victim, body_len, &wfile_pos) != body_len)
66+
error("write error");
67+
68+
- do_utime_path(&wfile->f_path, mtime);
69+
+ t[0].tv_sec = mtime;
70+
+ t[1].tv_sec = mtime;
71+
+ vfs_utimes(&wfile->f_path, t);
72+
+
73+
fput(wfile);
74+
if (csum_present && io_csum != hdr_csum)
75+
error("bad data checksum");

‎target/linux/generic/backport-5.19/002-struct-net_device.patch

+122
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
--- a/include/linux/netdevice.h
2+
+++ b/include/linux/netdevice.h
3+
@@ -2119,8 +2119,6 @@ struct net_device {
4+
5+
/* Protocol-specific pointers */
6+
7+
- struct in_device __rcu *ip_ptr;
8+
- struct inet6_dev __rcu *ip6_ptr;
9+
#if IS_ENABLED(CONFIG_VLAN_8021Q)
10+
struct vlan_info __rcu *vlan_info;
11+
#endif
12+
@@ -2133,18 +2131,16 @@ struct net_device {
13+
#if IS_ENABLED(CONFIG_ATALK)
14+
void *atalk_ptr;
15+
#endif
16+
+ struct in_device __rcu *ip_ptr;
17+
#if IS_ENABLED(CONFIG_DECNET)
18+
struct dn_dev __rcu *dn_ptr;
19+
#endif
20+
+ struct inet6_dev __rcu *ip6_ptr;
21+
#if IS_ENABLED(CONFIG_AX25)
22+
void *ax25_ptr;
23+
#endif
24+
-#if IS_ENABLED(CONFIG_CFG80211)
25+
struct wireless_dev *ieee80211_ptr;
26+
-#endif
27+
-#if IS_ENABLED(CONFIG_IEEE802154) || IS_ENABLED(CONFIG_6LOWPAN)
28+
struct wpan_dev *ieee802154_ptr;
29+
-#endif
30+
#if IS_ENABLED(CONFIG_MPLS_ROUTING)
31+
struct mpls_dev __rcu *mpls_ptr;
32+
#endif
33+
--- a/include/net/cfg80211.h
34+
+++ b/include/net/cfg80211.h
35+
@@ -8006,9 +8006,7 @@ int cfg80211_register_netdevice(struct n
36+
*/
37+
static inline void cfg80211_unregister_netdevice(struct net_device *dev)
38+
{
39+
-#if IS_ENABLED(CONFIG_CFG80211)
40+
cfg80211_unregister_wdev(dev->ieee80211_ptr);
41+
-#endif
42+
}
43+
44+
/**
45+
--- a/include/net/cfg802154.h
46+
+++ b/include/net/cfg802154.h
47+
@@ -373,7 +373,6 @@ struct wpan_dev {
48+
49+
#define to_phy(_dev) container_of(_dev, struct wpan_phy, dev)
50+
51+
-#if IS_ENABLED(CONFIG_IEEE802154) || IS_ENABLED(CONFIG_6LOWPAN)
52+
static inline int
53+
wpan_dev_hard_header(struct sk_buff *skb, struct net_device *dev,
54+
const struct ieee802154_addr *daddr,
55+
@@ -384,7 +383,6 @@ wpan_dev_hard_header(struct sk_buff *skb
56+
57+
return wpan_dev->header_ops->create(skb, dev, daddr, saddr, len);
58+
}
59+
-#endif
60+
61+
struct wpan_phy *
62+
wpan_phy_new(const struct cfg802154_ops *ops, size_t priv_size);
63+
--- a/net/batman-adv/hard-interface.c
64+
+++ b/net/batman-adv/hard-interface.c
65+
@@ -307,11 +307,9 @@ static bool batadv_is_cfg80211_netdev(st
66+
if (!net_device)
67+
return false;
68+
69+
-#if IS_ENABLED(CONFIG_CFG80211)
70+
/* cfg80211 drivers have to set ieee80211_ptr */
71+
if (net_device->ieee80211_ptr)
72+
return true;
73+
-#endif
74+
75+
return false;
76+
}
77+
--- a/net/core/net-sysfs.c
78+
+++ b/net/core/net-sysfs.c
79+
@@ -747,6 +747,7 @@ static const struct attribute_group nets
80+
.attrs = netstat_attrs,
81+
};
82+
83+
+#if IS_ENABLED(CONFIG_WIRELESS_EXT) || IS_ENABLED(CONFIG_CFG80211)
84+
static struct attribute *wireless_attrs[] = {
85+
NULL
86+
};
87+
@@ -755,19 +756,7 @@ static const struct attribute_group wire
88+
.name = "wireless",
89+
.attrs = wireless_attrs,
90+
};
91+
-
92+
-static bool wireless_group_needed(struct net_device *ndev)
93+
-{
94+
-#if IS_ENABLED(CONFIG_CFG80211)
95+
- if (ndev->ieee80211_ptr)
96+
- return true;
97+
#endif
98+
-#if IS_ENABLED(CONFIG_WIRELESS_EXT)
99+
- if (ndev->wireless_handlers)
100+
- return true;
101+
-#endif
102+
- return false;
103+
-}
104+
105+
#else /* CONFIG_SYSFS */
106+
#define net_class_groups NULL
107+
@@ -2008,8 +1997,14 @@ int netdev_register_kobject(struct net_d
108+
109+
*groups++ = &netstat_group;
110+
111+
- if (wireless_group_needed(ndev))
112+
+#if IS_ENABLED(CONFIG_WIRELESS_EXT) || IS_ENABLED(CONFIG_CFG80211)
113+
+ if (ndev->ieee80211_ptr)
114+
+ *groups++ = &wireless_group;
115+
+#if IS_ENABLED(CONFIG_WIRELESS_EXT)
116+
+ else if (ndev->wireless_handlers)
117+
*groups++ = &wireless_group;
118+
+#endif
119+
+#endif
120+
#endif /* CONFIG_SYSFS */
121+
122+
error = device_add(dev);

‎target/linux/generic/backport-5.19/011-kbuild-export-SUBARCH.patch

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
From 173019b66dcc9d68ad9333aa744dad1e369b5aa8 Mon Sep 17 00:00:00 2001
2+
From: Felix Fietkau <[email protected]>
3+
Date: Sun, 9 Jul 2017 00:26:53 +0200
4+
Subject: [PATCH 34/34] kernel: add compile fix for linux 4.9 on x86
5+
6+
Signed-off-by: Felix Fietkau <[email protected]>
7+
---
8+
Makefile | 4 ++--
9+
1 file changed, 2 insertions(+), 2 deletions(-)
10+
11+
--- a/Makefile
12+
+++ b/Makefile
13+
@@ -534,7 +534,7 @@ KBUILD_LDFLAGS_MODULE :=
14+
KBUILD_LDFLAGS :=
15+
CLANG_FLAGS :=
16+
17+
-export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE LD CC HOSTPKG_CONFIG
18+
+export ARCH SRCARCH SUBARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE LD CC HOSTPKG_CONFIG
19+
export CPP AR NM STRIP OBJCOPY OBJDUMP READELF PAHOLE RESOLVE_BTFIDS LEX YACC AWK INSTALLKERNEL
20+
export PERL PYTHON3 CHECK CHECKFLAGS MAKE UTS_MACHINE HOSTCXX
21+
export KGZIP KBZIP2 KLZOP LZMA LZ4 XZ ZSTD

‎target/linux/generic/backport-5.19/343-netfilter-nft_flow_offload-handle-netdevice-events-f.patch

+106
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
From: Pablo Neira Ayuso <[email protected]>
2+
Date: Thu, 25 Jan 2018 12:58:55 +0100
3+
Subject: [PATCH] netfilter: nft_flow_offload: handle netdevice events from
4+
nf_flow_table
5+
6+
Move the code that deals with device events to the core.
7+
8+
Signed-off-by: Pablo Neira Ayuso <[email protected]>
9+
---
10+
11+
--- a/net/netfilter/nf_flow_table_core.c
12+
+++ b/net/netfilter/nf_flow_table_core.c
13+
@@ -614,13 +614,41 @@ void nf_flow_table_free(struct nf_flowta
14+
}
15+
EXPORT_SYMBOL_GPL(nf_flow_table_free);
16+
17+
+static int nf_flow_table_netdev_event(struct notifier_block *this,
18+
+ unsigned long event, void *ptr)
19+
+{
20+
+ struct net_device *dev = netdev_notifier_info_to_dev(ptr);
21+
+
22+
+ if (event != NETDEV_DOWN)
23+
+ return NOTIFY_DONE;
24+
+
25+
+ nf_flow_table_cleanup(dev);
26+
+
27+
+ return NOTIFY_DONE;
28+
+}
29+
+
30+
+static struct notifier_block flow_offload_netdev_notifier = {
31+
+ .notifier_call = nf_flow_table_netdev_event,
32+
+};
33+
+
34+
static int __init nf_flow_table_module_init(void)
35+
{
36+
- return nf_flow_table_offload_init();
37+
+ int ret;
38+
+
39+
+ ret = nf_flow_table_offload_init();
40+
+ if (ret)
41+
+ return ret;
42+
+
43+
+ ret = register_netdevice_notifier(&flow_offload_netdev_notifier);
44+
+ if (ret)
45+
+ nf_flow_table_offload_exit();
46+
+
47+
+ return ret;
48+
}
49+
50+
static void __exit nf_flow_table_module_exit(void)
51+
{
52+
+ unregister_netdevice_notifier(&flow_offload_netdev_notifier);
53+
nf_flow_table_offload_exit();
54+
}
55+
56+
--- a/net/netfilter/nft_flow_offload.c
57+
+++ b/net/netfilter/nft_flow_offload.c
58+
@@ -468,47 +468,14 @@ static struct nft_expr_type nft_flow_off
59+
.owner = THIS_MODULE,
60+
};
61+
62+
-static int flow_offload_netdev_event(struct notifier_block *this,
63+
- unsigned long event, void *ptr)
64+
-{
65+
- struct net_device *dev = netdev_notifier_info_to_dev(ptr);
66+
-
67+
- if (event != NETDEV_DOWN)
68+
- return NOTIFY_DONE;
69+
-
70+
- nf_flow_table_cleanup(dev);
71+
-
72+
- return NOTIFY_DONE;
73+
-}
74+
-
75+
-static struct notifier_block flow_offload_netdev_notifier = {
76+
- .notifier_call = flow_offload_netdev_event,
77+
-};
78+
-
79+
static int __init nft_flow_offload_module_init(void)
80+
{
81+
- int err;
82+
-
83+
- err = register_netdevice_notifier(&flow_offload_netdev_notifier);
84+
- if (err)
85+
- goto err;
86+
-
87+
- err = nft_register_expr(&nft_flow_offload_type);
88+
- if (err < 0)
89+
- goto register_expr;
90+
-
91+
- return 0;
92+
-
93+
-register_expr:
94+
- unregister_netdevice_notifier(&flow_offload_netdev_notifier);
95+
-err:
96+
- return err;
97+
+ return nft_register_expr(&nft_flow_offload_type);
98+
}
99+
100+
static void __exit nft_flow_offload_module_exit(void)
101+
{
102+
nft_unregister_expr(&nft_flow_offload_type);
103+
- unregister_netdevice_notifier(&flow_offload_netdev_notifier);
104+
}
105+
106+
module_init(nft_flow_offload_module_init);

0 commit comments

Comments
 (0)