298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

kernel: refresh 6.12 patches (#13178)

Browse Source
This commit is contained in:
Beginner 2024-12-07 10:56:20 +08:00 committed by GitHub
parent cb4244db53
commit d83ce75e31
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
20 changed files with 82 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/generic/hack-6.12/253-ksmbd-config.patch
View File

@ -1,6 +1,6 @@
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -2030,7 +2030,7 @@ config PADATA
@@ -2043,7 +2043,7 @@ config PADATA
bool
config ASN1

2
target/linux/generic/hack-6.12/410-block-fit-partition-parser.patch
View File

@ -1,6 +1,6 @@
--- a/block/blk.h
+++ b/block/blk.h
@@ -558,6 +558,8 @@ void blk_free_ext_minor(unsigned int min
@@ -564,6 +564,8 @@ void blk_free_ext_minor(unsigned int min
#define ADDPART_FLAG_NONE 0
#define ADDPART_FLAG_RAID 1
#define ADDPART_FLAG_WHOLEDISK 2

4
target/linux/generic/hack-6.12/650-netfilter-add-xt_FLOWOFFLOAD-target.patch
View File

@ -8,7 +8,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -712,8 +712,6 @@ config NFT_REJECT_NETDEV
@@ -715,8 +715,6 @@ config NFT_REJECT_NETDEV
endif # NF_TABLES_NETDEV
@ -17,7 +17,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
config NF_FLOW_TABLE_INET
tristate "Netfilter flow table mixed IPv4/IPv6 module"
depends on NF_FLOW_TABLE
@@ -722,11 +720,12 @@ config NF_FLOW_TABLE_INET
@@ -725,11 +723,12 @@ config NF_FLOW_TABLE_INET
To compile it as a module, choose M here.

4
target/linux/generic/hack-6.12/780-usb-net-MeigLink_modem_support.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -1082,6 +1082,7 @@ static const struct usb_device_id produc
@@ -1083,6 +1083,7 @@ static const struct usb_device_id produc
{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0620)}, /* Quectel EM160R-GL */
{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0800)}, /* Quectel RM500Q-GL */
{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0801)}, /* Quectel RM520N */
@ -19,7 +19,7 @@
#define QUECTEL_VENDOR_ID 0x2c7c
/* These Quectel products use Quectel's vendor ID */
@@ -1199,6 +1201,11 @@ static const struct usb_device_id option
@@ -1201,6 +1203,11 @@ static const struct usb_device_id option
.driver_info = ZLP },
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
.driver_info = RSVD(4) },

4
target/linux/generic/hack-6.12/902-debloat_proc.patch
View File

@ -235,7 +235,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!pe)
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -2192,10 +2192,12 @@ void __init init_mm_internals(void)
@@ -2194,10 +2194,12 @@ void __init init_mm_internals(void)
start_shepherd_timer();
#endif
#ifdef CONFIG_PROC_FS
@ -319,7 +319,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -4223,6 +4223,8 @@ static __net_initdata struct pernet_oper
@@ -4229,6 +4229,8 @@ static __net_initdata struct pernet_oper
static int __init proto_init(void)
{

4
target/linux/generic/hack-6.12/904-debloat_dma_buf.patch
View File

@ -64,7 +64,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+dma-shared-buffer-objs := $(dma-buf-objs-y)
--- a/drivers/dma-buf/dma-buf.c
+++ b/drivers/dma-buf/dma-buf.c
@@ -1731,4 +1731,5 @@ static void __exit dma_buf_deinit(void)
@@ -1743,4 +1743,5 @@ static void __exit dma_buf_deinit(void)
kern_unmount(dma_buf_mnt);
dma_buf_uninit_sysfs_statistics();
}
@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+MODULE_LICENSE("GPL");
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -4487,6 +4487,7 @@ int wake_up_state(struct task_struct *p,
@@ -4419,6 +4419,7 @@ int wake_up_state(struct task_struct *p,
{
return try_to_wake_up(p, state, 0);
}

2
target/linux/generic/hack-6.12/920-device_tree_cmdline.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -1051,6 +1051,9 @@ int __init early_init_dt_scan_chosen(cha
@@ -1052,6 +1052,9 @@ int __init early_init_dt_scan_chosen(cha
p = of_get_flat_dt_prop(node, "bootargs", &l);
if (p != NULL && l > 0)
strscpy(cmdline, p, min(l, COMMAND_LINE_SIZE));

8
target/linux/generic/hack-6.12/952-add-net-conntrack-events-support-multiple-registrant.patch
View File

@ -123,7 +123,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
depends on NETFILTER_ADVANCED
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -2801,6 +2801,10 @@ int nf_conntrack_init_net(struct net *ne
@@ -2750,6 +2750,10 @@ int nf_conntrack_init_net(struct net *ne
nf_conntrack_ecache_pernet_init(net);
nf_conntrack_proto_pernet_init(net);
@ -299,7 +299,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
void nf_conntrack_ecache_work(struct net *net, enum nf_ct_ecache_state state)
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -723,12 +723,19 @@ static size_t ctnetlink_nlmsg_size(const
@@ -721,12 +721,19 @@ static size_t ctnetlink_nlmsg_size(const
}
static int
@ -319,7 +319,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
struct nf_conn *ct = item->ct;
struct sk_buff *skb;
unsigned int type;
@@ -3750,11 +3757,17 @@ static int ctnetlink_stat_exp_cpu(struct
@@ -3754,11 +3761,17 @@ static int ctnetlink_stat_exp_cpu(struct
}
#ifdef CONFIG_NF_CONNTRACK_EVENTS
@ -337,7 +337,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
static const struct nfnl_callback ctnl_cb[IPCTNL_MSG_MAX] = {
[IPCTNL_MSG_CT_NEW] = {
@@ -3853,8 +3866,12 @@ static int __net_init ctnetlink_net_init
@@ -3857,8 +3870,12 @@ static int __net_init ctnetlink_net_init
static void ctnetlink_net_pre_exit(struct net *net)
{
#ifdef CONFIG_NF_CONNTRACK_EVENTS

20
target/linux/generic/hack-6.12/953-net-patch-linux-kernel-to-support-shortcut-fe.patch
View File

@ -1,6 +1,6 @@
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
@@ -72,6 +72,9 @@ void brioctl_set(int (*hook)(struct net
@@ -71,6 +71,9 @@ void brioctl_set(int (*hook)(struct net
int br_ioctl_call(struct net *net, struct net_bridge *br, unsigned int cmd,
struct ifreq *ifr, void __user *uarg);
@ -12,7 +12,7 @@
struct list_head *br_ip_list);
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -1011,6 +1011,9 @@
@@ -1011,6 +1011,9 @@ struct sk_buff {
__u8 csum_not_inet:1;
#endif
__u8 unreadable:1;
@ -35,7 +35,7 @@
const struct nf_ct_event_notifier *nb);
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -504,6 +504,9 @@ config FAILOVER
@@ -512,6 +512,9 @@ config FAILOVER
migration of VMs with direct attached VFs by failing over to the
paravirtual datapath when the VF is unplugged.
@ -44,7 +44,7 @@
+
config ETHTOOL_NETLINK
bool "Netlink interface for ethtool"
default y
select DIMLIB
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -764,6 +764,28 @@ void br_port_flags_change(struct net_bri
@ -78,7 +78,7 @@
struct net_bridge_port *p;
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3567,9 +3567,17 @@ static int xmit_one(struct sk_buff *skb,
@@ -3579,9 +3579,17 @@ static int xmit_one(struct sk_buff *skb,
{
unsigned int len;
int rc;
@ -95,9 +95,9 @@
+ }
+#endif
#ifdef CONFIG_ETHERNET_PACKET_MANGLE
if (dev->eth_mangle_tx && !(skb = dev->eth_mangle_tx(dev, skb)))
@@ -5308,6 +5316,11 @@ void netdev_rx_handler_unregister(struct
len = skb->len;
trace_net_dev_start_xmit(skb, dev);
@@ -5417,6 +5425,11 @@ void netdev_rx_handler_unregister(struct
}
EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);
@ -109,7 +109,7 @@
/*
* Limit the use of PFMEMALLOC reserves to those protocols that implement
* the special handling of PFMEMALLOC skbs.
@@ -5356,6 +5369,10 @@ static int __netif_receive_skb_core(stru
@@ -5465,6 +5478,10 @@ static int __netif_receive_skb_core(stru
int ret = NET_RX_DROP;
__be16 type;
@ -120,7 +120,7 @@
net_timestamp_check(!READ_ONCE(net_hotdata.tstamp_prequeue), skb);
trace_netif_receive_skb(skb);
@@ -5393,6 +5410,15 @@ another_round:
@@ -5503,6 +5520,15 @@ another_round:
goto out;
}

2
target/linux/generic/hack-6.12/992-add-ndo-do-ioctl.patch
View File

@ -1,6 +1,6 @@
--- a/net/wireless/wext-core.c
+++ b/net/wireless/wext-core.c
@@ -981,6 +981,9 @@ static int wireless_process_ioctl(struct
@@ -984,6 +984,9 @@ static int wireless_process_ioctl(struct
else if (private)
return private(dev, iwr, cmd, info, handler);
}

40
target/linux/generic/hack-6.12/998-revert-genetlink-remove-userhdr-from-struct-genl_inf.patch
View File

@ -25,7 +25,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
const u8 cmd = info->genlhdr->cmd;
int err;
@@ -1396,9 +1396,8 @@ static void drbd_suspend_al(struct drbd_
@@ -1388,9 +1388,8 @@ static void drbd_suspend_al(struct drbd_
static bool should_set_defaults(struct genl_info *info)
{
@ -37,7 +37,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
}
static unsigned int drbd_al_extents_max(struct drbd_backing_dev *bdev)
@@ -4277,7 +4276,7 @@ static void device_to_info(struct device
@@ -4268,7 +4267,7 @@ static void device_to_info(struct device
int drbd_adm_new_minor(struct sk_buff *skb, struct genl_info *info)
{
struct drbd_config_context adm_ctx;
@ -48,7 +48,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
retcode = drbd_adm_prepare(&adm_ctx, skb, info, DRBD_ADM_NEED_RESOURCE);
--- a/include/net/genetlink.h
+++ b/include/net/genetlink.h
@@ -98,6 +98,7 @@ struct genl_family {
@@ -122,6 +122,7 @@ struct genl_family {
* @family: generic netlink family
* @nlhdr: netlink message header
* @genlhdr: generic netlink message header
@ -56,7 +56,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
* @attrs: netlink attributes
* @_net: network namespace
* @user_ptr: user pointers
@@ -109,6 +110,7 @@ struct genl_info {
@@ -133,6 +134,7 @@ struct genl_info {
const struct genl_family *family;
const struct nlmsghdr * nlhdr;
struct genlmsghdr * genlhdr;
@ -64,7 +64,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
struct nlattr ** attrs;
possible_net_t _net;
void * user_ptr[2];
@@ -125,11 +127,6 @@ static inline void genl_info_net_set(str
@@ -149,11 +151,6 @@ static inline void genl_info_net_set(str
write_pnet(&info->_net, net);
}
@ -78,7 +78,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
#define GENL_SET_ERR_MSG_FMT(info, msg, args...) \
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -957,6 +957,7 @@ static int genl_family_rcv_msg_doit(cons
@@ -1101,6 +1101,7 @@ static int genl_family_rcv_msg_doit(cons
info.family = family;
info.nlhdr = nlh;
info.genlhdr = nlmsg_data(nlh);
@ -88,7 +88,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
genl_info_net_set(&info, net);
--- a/net/openvswitch/conntrack.c
+++ b/net/openvswitch/conntrack.c
@@ -1605,7 +1605,7 @@ static struct sk_buff *
@@ -1642,7 +1642,7 @@ static struct sk_buff *
ovs_ct_limit_cmd_reply_start(struct genl_info *info, u8 cmd,
struct ovs_header **ovs_reply_header)
{
@ -99,7 +99,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
skb = genlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -590,7 +590,7 @@ out:
@@ -589,7 +589,7 @@ out:
static int ovs_packet_cmd_execute(struct sk_buff *skb, struct genl_info *info)
{
@ -108,7 +108,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
struct net *net = sock_net(skb->sk);
struct nlattr **a = info->attrs;
struct sw_flow_actions *acts;
@@ -967,7 +967,7 @@ static int ovs_flow_cmd_new(struct sk_bu
@@ -966,7 +966,7 @@ static int ovs_flow_cmd_new(struct sk_bu
{
struct net *net = sock_net(skb->sk);
struct nlattr **a = info->attrs;
@ -117,7 +117,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
struct sw_flow *flow = NULL, *new_flow;
struct sw_flow_mask mask;
struct sk_buff *reply;
@@ -1214,7 +1214,7 @@ static int ovs_flow_cmd_set(struct sk_bu
@@ -1213,7 +1213,7 @@ static int ovs_flow_cmd_set(struct sk_bu
{
struct net *net = sock_net(skb->sk);
struct nlattr **a = info->attrs;
@ -126,7 +126,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
struct sw_flow_key key;
struct sw_flow *flow;
struct sk_buff *reply = NULL;
@@ -1315,7 +1315,7 @@ error:
@@ -1314,7 +1314,7 @@ error:
static int ovs_flow_cmd_get(struct sk_buff *skb, struct genl_info *info)
{
struct nlattr **a = info->attrs;
@ -135,7 +135,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
struct net *net = sock_net(skb->sk);
struct sw_flow_key key;
struct sk_buff *reply;
@@ -1374,7 +1374,7 @@ unlock:
@@ -1373,7 +1373,7 @@ unlock:
static int ovs_flow_cmd_del(struct sk_buff *skb, struct genl_info *info)
{
struct nlattr **a = info->attrs;
@ -144,7 +144,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
struct net *net = sock_net(skb->sk);
struct sw_flow_key key;
struct sk_buff *reply;
@@ -1642,7 +1642,7 @@ static void ovs_dp_reset_user_features(s
@@ -1641,7 +1641,7 @@ static void ovs_dp_reset_user_features(s
{
struct datapath *dp;
@ -153,7 +153,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
info->attrs);
if (IS_ERR(dp))
return;
@@ -1935,8 +1935,7 @@ static int ovs_dp_cmd_del(struct sk_buff
@@ -1934,8 +1934,7 @@ static int ovs_dp_cmd_del(struct sk_buff
return -ENOMEM;
ovs_lock();
@ -163,7 +163,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
err = PTR_ERR(dp);
if (IS_ERR(dp))
goto err_unlock_free;
@@ -1969,8 +1968,7 @@ static int ovs_dp_cmd_set(struct sk_buff
@@ -1968,8 +1967,7 @@ static int ovs_dp_cmd_set(struct sk_buff
return -ENOMEM;
ovs_lock();
@ -173,7 +173,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
err = PTR_ERR(dp);
if (IS_ERR(dp))
goto err_unlock_free;
@@ -2005,8 +2003,7 @@ static int ovs_dp_cmd_get(struct sk_buff
@@ -2004,8 +2002,7 @@ static int ovs_dp_cmd_get(struct sk_buff
return -ENOMEM;
ovs_lock();
@ -183,7 +183,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
if (IS_ERR(dp)) {
err = PTR_ERR(dp);
goto err_unlock_free;
@@ -2249,7 +2246,7 @@ static void ovs_update_headroom(struct d
@@ -2248,7 +2245,7 @@ static void ovs_update_headroom(struct d
static int ovs_vport_cmd_new(struct sk_buff *skb, struct genl_info *info)
{
struct nlattr **a = info->attrs;
@ -192,7 +192,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
struct vport_parms parms;
struct sk_buff *reply;
struct vport *vport;
@@ -2351,7 +2348,7 @@ static int ovs_vport_cmd_set(struct sk_b
@@ -2350,7 +2347,7 @@ static int ovs_vport_cmd_set(struct sk_b
return -ENOMEM;
ovs_lock();
@ -201,7 +201,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
err = PTR_ERR(vport);
if (IS_ERR(vport))
goto exit_unlock_free;
@@ -2407,7 +2404,7 @@ static int ovs_vport_cmd_del(struct sk_b
@@ -2406,7 +2403,7 @@ static int ovs_vport_cmd_del(struct sk_b
return -ENOMEM;
ovs_lock();
@ -210,7 +210,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e.
err = PTR_ERR(vport);
if (IS_ERR(vport))
goto exit_unlock_free;
@@ -2450,7 +2447,7 @@ exit_unlock_free:
@@ -2449,7 +2446,7 @@ exit_unlock_free:
static int ovs_vport_cmd_get(struct sk_buff *skb, struct genl_info *info)
{
struct nlattr **a = info->attrs;

20
target/linux/generic/hack-6.12/999-revert-6.5-deprecated-API.patch
View File

@ -1,6 +1,6 @@
--- a/include/linux/device/class.h
+++ b/include/linux/device/class.h
@@ -51,6 +51,7 @@ struct fwnode_handle;
@@ -49,6 +49,7 @@ struct fwnode_handle;
*/
struct class {
const char *name;
@ -10,7 +10,7 @@
const struct attribute_group **dev_groups;
--- a/include/linux/prandom.h
+++ b/include/linux/prandom.h
@@ -24,6 +24,12 @@ void prandom_seed_full_state(struct rnd_
@@ -23,6 +23,12 @@ void prandom_seed_full_state(struct rnd_
#define prandom_init_once(pcpu_state) \
DO_ONCE(prandom_seed_full_state, (pcpu_state))
@ -25,7 +25,7 @@
*/
--- a/include/linux/u64_stats_sync.h
+++ b/include/linux/u64_stats_sync.h
@@ -213,4 +213,16 @@ static inline bool u64_stats_fetch_retry
@@ -214,4 +214,16 @@ static inline bool u64_stats_fetch_retry
return __u64_stats_fetch_retry(syncp, start);
}
@ -44,7 +44,7 @@
#endif /* _LINUX_U64_STATS_SYNC_H */
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2996,6 +2996,8 @@
@@ -2996,6 +2996,8 @@ int call_netdevice_notifiers(unsigned lo
int call_netdevice_notifiers_info(unsigned long val,
struct netdev_notifier_info *info);
@ -55,7 +55,7 @@
#define for_each_netdev_reverse(net, d) \
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -172,6 +172,28 @@
@@ -172,6 +172,28 @@ static int call_netdevice_notifiers_exta
struct net_device *dev,
struct netlink_ext_ack *extack);
@ -84,7 +84,7 @@
static DEFINE_MUTEX(ifalias_mutex);
/* protects napi_hash addition/deletion and napi_gen_id */
@@ -403,10 +425,12 @@
@@ -403,10 +425,12 @@ static void list_netdevice(struct net_de
ASSERT_RTNL();
@ -97,7 +97,7 @@
netdev_for_each_altname(dev, name_node)
netdev_name_node_add(net, name_node);
@@ -433,9 +457,11 @@
@@ -433,9 +457,11 @@ static void unlist_netdevice(struct net_
netdev_name_node_del(name_node);
/* Unlink dev from the device chain */
@ -109,7 +109,7 @@
dev_base_seq_inc(dev_net(dev));
}
@@ -758,9 +784,9 @@
@@ -758,9 +784,9 @@ EXPORT_SYMBOL_GPL(dev_fill_forward_path)
* @net: the applicable net namespace
* @name: name to find
*
@ -122,7 +122,7 @@
* reference counters are not incremented so the caller must be
* careful with locks.
*/
@@ -841,7 +867,8 @@
@@ -841,7 +867,8 @@ EXPORT_SYMBOL(netdev_get_by_name);
* Search for an interface by index. Returns %NULL if the device
* is not found or a pointer to the device. The device has not
* had its reference counter increased so the caller must be careful
@ -132,7 +132,7 @@
*/
struct net_device *__dev_get_by_index(struct net *net, int ifindex)
@@ -1259,11 +1286,15 @@
@@ -1259,11 +1286,15 @@ rollback:
netdev_adjacent_rename_links(dev, oldname);

2
target/linux/generic/pending-6.12/300-mips_expose_boot_raw.patch
View File

@ -19,7 +19,7 @@ Acked-by: Rob Landley <rob@landley.net>
config CEVT_BCM1480
bool
@@ -2988,6 +2985,18 @@ choice
@@ -2991,6 +2988,18 @@ choice
bool "Extend builtin kernel arguments with bootloader arguments"
endchoice

10
target/linux/generic/pending-6.12/613-netfilter_optional_tcp_window_check.patch
View File

@ -25,7 +25,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
/*
* Get the required data from the packet.
*/
@@ -1285,7 +1289,7 @@ int nf_conntrack_tcp_packet(struct nf_co
@@ -1286,7 +1290,7 @@ int nf_conntrack_tcp_packet(struct nf_co
IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED &&
timeouts[new_state] > timeouts[TCP_CONNTRACK_UNACK])
timeout = timeouts[TCP_CONNTRACK_UNACK];
@ -34,7 +34,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
timeouts[new_state] > timeouts[TCP_CONNTRACK_RETRANS])
timeout = timeouts[TCP_CONNTRACK_RETRANS];
else
@@ -1601,6 +1605,9 @@ void nf_conntrack_tcp_init_net(struct ne
@@ -1602,6 +1606,9 @@ void nf_conntrack_tcp_init_net(struct ne
*/
tn->tcp_be_liberal = 0;
@ -46,7 +46,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -630,6 +630,7 @@ enum nf_ct_sysctl_index {
@@ -628,6 +628,7 @@ enum nf_ct_sysctl_index {
#endif
NF_SYSCTL_CT_PROTO_TCP_LOOSE,
NF_SYSCTL_CT_PROTO_TCP_LIBERAL,
@ -54,7 +54,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
NF_SYSCTL_CT_PROTO_TCP_IGNORE_INVALID_RST,
NF_SYSCTL_CT_PROTO_TCP_MAX_RETRANS,
NF_SYSCTL_CT_PROTO_TIMEOUT_UDP,
@@ -834,6 +835,14 @@ static struct ctl_table nf_ct_sysctl_tab
@@ -830,6 +831,14 @@ static struct ctl_table nf_ct_sysctl_tab
.extra1 = SYSCTL_ZERO,
.extra2 = SYSCTL_ONE,
},
@ -69,7 +69,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
[NF_SYSCTL_CT_PROTO_TCP_IGNORE_INVALID_RST] = {
.procname = "nf_conntrack_tcp_ignore_invalid_rst",
.maxlen = sizeof(u8),
@@ -1035,6 +1044,7 @@ static void nf_conntrack_standalone_init
@@ -1029,6 +1038,7 @@ static void nf_conntrack_standalone_init
XASSIGN(LOOSE, &tn->tcp_loose);
XASSIGN(LIBERAL, &tn->tcp_be_liberal);

22
target/linux/generic/pending-6.12/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
View File

@ -76,7 +76,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
static inline const char *rtn_type(char *buf, size_t len, unsigned int t)
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -181,6 +181,7 @@ static int ipmr_rule_action(struct fib_r
@@ -191,6 +191,7 @@ static int ipmr_rule_action(struct fib_r
case FR_ACT_UNREACHABLE:
return -ENETUNREACH;
case FR_ACT_PROHIBIT:
@ -99,7 +99,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
tb_id = fib_rule_get_table(rule, arg);
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -170,6 +170,8 @@ static int ip6mr_rule_action(struct fib_
@@ -180,6 +180,8 @@ static int ip6mr_rule_action(struct fib_
return -ENETUNREACH;
case FR_ACT_PROHIBIT:
return -EACCES;
@ -138,7 +138,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
static const struct rt6_info ip6_blk_hole_entry_template = {
.dst = {
.__rcuref = RCUREF_INIT(1),
@@ -1048,6 +1062,7 @@ static const int fib6_prop[RTN_MAX + 1]
@@ -1051,6 +1065,7 @@ static const int fib6_prop[RTN_MAX + 1]
[RTN_BLACKHOLE] = -EINVAL,
[RTN_UNREACHABLE] = -EHOSTUNREACH,
[RTN_PROHIBIT] = -EACCES,
@ -146,7 +146,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
[RTN_THROW] = -EAGAIN,
[RTN_NAT] = -EINVAL,
[RTN_XRESOLVE] = -EINVAL,
@@ -1083,6 +1098,10 @@ static void ip6_rt_init_dst_reject(struc
@@ -1086,6 +1101,10 @@ static void ip6_rt_init_dst_reject(struc
rt->dst.output = ip6_pkt_prohibit_out;
rt->dst.input = ip6_pkt_prohibit;
break;
@ -185,7 +185,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
cfg->fc_flags |= RTF_REJECT;
if (rtm->rtm_type == RTN_LOCAL)
@@ -6291,6 +6322,8 @@ static int ip6_route_dev_notify(struct n
@@ -6306,6 +6337,8 @@ static int ip6_route_dev_notify(struct n
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
net->ipv6.ip6_prohibit_entry->dst.dev = dev;
net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
@ -194,7 +194,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
#endif
@@ -6302,6 +6335,7 @@ static int ip6_route_dev_notify(struct n
@@ -6317,6 +6350,7 @@ static int ip6_route_dev_notify(struct n
in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev);
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev);
@ -202,7 +202,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev);
#endif
}
@@ -6497,6 +6531,8 @@ static int __net_init ip6_route_net_init
@@ -6512,6 +6546,8 @@ static int __net_init ip6_route_net_init
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
net->ipv6.fib6_has_custom_rules = false;
@ -211,7 +211,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template,
sizeof(*net->ipv6.ip6_prohibit_entry),
GFP_KERNEL);
@@ -6507,11 +6543,21 @@ static int __net_init ip6_route_net_init
@@ -6522,11 +6558,21 @@ static int __net_init ip6_route_net_init
ip6_template_metrics, true);
INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->dst.rt_uncached);
@ -234,7 +234,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
ip6_template_metrics, true);
@@ -6538,6 +6584,8 @@ out:
@@ -6553,6 +6599,8 @@ out:
return ret;
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
@ -243,7 +243,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
out_ip6_prohibit_entry:
kfree(net->ipv6.ip6_prohibit_entry);
out_ip6_null_entry:
@@ -6557,6 +6605,7 @@ static void __net_exit ip6_route_net_exi
@@ -6572,6 +6620,7 @@ static void __net_exit ip6_route_net_exi
kfree(net->ipv6.ip6_null_entry);
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
kfree(net->ipv6.ip6_prohibit_entry);
@ -251,7 +251,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
kfree(net->ipv6.ip6_blk_hole_entry);
#endif
dst_entries_destroy(&net->ipv6.ip6_dst_ops);
@@ -6640,6 +6689,9 @@ void __init ip6_route_init_special_entri
@@ -6655,6 +6704,9 @@ void __init ip6_route_init_special_entri
init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);

2
target/linux/generic/pending-6.12/920-mangle_bootargs.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1855,6 +1855,15 @@ config ARCH_HAS_MEMBARRIER_CALLBACKS
@@ -1868,6 +1868,15 @@ config ARCH_HAS_MEMBARRIER_CALLBACKS
config ARCH_HAS_MEMBARRIER_SYNC_CORE
bool

2
target/linux/x86/patches-6.12/992-enable-intel-guc.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
@@ -26,10 +26,14 @@ static void uc_expand_default_options(st
@@ -31,10 +31,14 @@ static void uc_expand_default_options(st
return;
/* Don't enable GuC/HuC on pre-Gen12 */

8
target/linux/x86/patches-6.12/993-bnx2x_warpcore_8727_2_5g_sgmii_txfault.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -1592,6 +1592,7 @@ struct bnx2x {
@@ -1593,6 +1593,7 @@ struct bnx2x {
uint num_ethernet_queues;
uint num_cnic_queues;
int disable_tpa;
@ -182,7 +182,7 @@
/* Clean trail, interrupt corrects the leds */
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -113,6 +113,10 @@ static int disable_tpa;
@@ -112,6 +112,10 @@ static int disable_tpa;
module_param(disable_tpa, int, 0444);
MODULE_PARM_DESC(disable_tpa, " Disable the TPA (LRO) feature");
@ -193,7 +193,7 @@
static int int_mode;
module_param(int_mode, int, 0444);
MODULE_PARM_DESC(int_mode, " Force interrupt mode other than MSI-X "
@@ -12342,6 +12346,8 @@ static int bnx2x_init_bp(struct bnx2x *b
@@ -12344,6 +12348,8 @@ static int bnx2x_init_bp(struct bnx2x *b
if (BP_NOMCP(bp) && (func == 0))
dev_err(&bp->pdev->dev, "MCP disabled, must load devices in order!\n");
@ -204,7 +204,7 @@
/* Reduce memory usage in kdump environment by disabling TPA */
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
@@ -7169,7 +7169,8 @@ Theotherbitsarereservedandshouldbezero*/
@@ -7171,7 +7171,8 @@ Theotherbitsarereservedandshouldbezero*/
#define MDIO_PMA_REG_8727_PCS_GP 0xc842
#define MDIO_PMA_REG_8727_OPT_CFG_REG 0xc8e4

2
target/linux/x86/patches-6.12/996-intel-igc-i225-i226-disable-eee.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -109,7 +109,7 @@ void igc_reset(struct igc_adapter *adapt
@@ -108,7 +108,7 @@ void igc_reset(struct igc_adapter *adapt
netdev_err(dev, "Error on hardware initialization\n");
/* Re-establish EEE setting */

4
target/linux/x86/patches-6.12/999-Add-xtsproxy-Crypto-API-module.patch
View File

@ -15,7 +15,7 @@ when FPU is not usable.
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -704,6 +704,16 @@ config CRYPTO_HCTR2
@@ -683,6 +683,16 @@ config CRYPTO_HCTR2
See https://eprint.iacr.org/2021/1441
@ -34,7 +34,7 @@ when FPU is not usable.
select CRYPTO_SKCIPHER
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -93,6 +93,7 @@ obj-$(CONFIG_CRYPTO_PCBC) += pcbc.o
@@ -89,6 +89,7 @@ obj-$(CONFIG_CRYPTO_PCBC) += pcbc.o
obj-$(CONFIG_CRYPTO_CTS) += cts.o
obj-$(CONFIG_CRYPTO_LRW) += lrw.o
obj-$(CONFIG_CRYPTO_XTS) += xts.o