diff --git a/include/kernel-6.0 b/include/kernel-6.0 index 555790b3a..ddf925ec7 100644 --- a/include/kernel-6.0 +++ b/include/kernel-6.0 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.0 = .5 -LINUX_KERNEL_HASH-6.0.5 = 61332ef22b53c50c10faabfb965896a7d1ad4f3381f0f89643c820f28a60418e +LINUX_VERSION-6.0 = .6 +LINUX_KERNEL_HASH-6.0.6 = 864b05af2d869ba73d61a9c5959e4531a141ab2bd7b217483671f625f9747faa diff --git a/target/linux/generic/hack-6.0/660-fq_codel_defaults.patch b/target/linux/generic/hack-6.0/660-fq_codel_defaults.patch index ba21555a0..42698c645 100644 --- a/target/linux/generic/hack-6.0/660-fq_codel_defaults.patch +++ b/target/linux/generic/hack-6.0/660-fq_codel_defaults.patch @@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau --- a/net/sched/sch_fq_codel.c +++ b/net/sched/sch_fq_codel.c -@@ -476,7 +476,11 @@ static int fq_codel_init(struct Qdisc *s +@@ -474,7 +474,11 @@ static int fq_codel_init(struct Qdisc *s sch->limit = 10*1024; q->flows_cnt = 1024; diff --git a/target/linux/generic/hack-6.0/661-use_fq_codel_by_default.patch b/target/linux/generic/hack-6.0/661-use_fq_codel_by_default.patch index c76ba3693..5dfc7f462 100644 --- a/target/linux/generic/hack-6.0/661-use_fq_codel_by_default.patch +++ b/target/linux/generic/hack-6.0/661-use_fq_codel_by_default.patch @@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau device, it has to decide which ones to send first, which ones to --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c -@@ -2276,7 +2276,7 @@ static int __init pktsched_init(void) +@@ -2277,7 +2277,7 @@ static int __init pktsched_init(void) return err; } @@ -55,7 +55,7 @@ Signed-off-by: Felix Fietkau register_qdisc(&pfifo_head_drop_qdisc_ops); --- a/net/sched/sch_fq_codel.c +++ b/net/sched/sch_fq_codel.c -@@ -721,7 +721,7 @@ static const struct Qdisc_class_ops fq_c +@@ -719,7 +719,7 @@ static const struct Qdisc_class_ops fq_c .walk = fq_codel_walk, }; @@ -64,7 +64,7 @@ Signed-off-by: Felix Fietkau .cl_ops = &fq_codel_class_ops, .id = "fq_codel", .priv_size = sizeof(struct fq_codel_sched_data), -@@ -736,6 +736,7 @@ static struct Qdisc_ops fq_codel_qdisc_o +@@ -734,6 +734,7 @@ static struct Qdisc_ops fq_codel_qdisc_o .dump_stats = fq_codel_dump_stats, .owner = THIS_MODULE, }; diff --git a/target/linux/generic/hack-6.0/953-net-patch-linux-kernel-to-support-shortcut-fe.patch b/target/linux/generic/hack-6.0/953-net-patch-linux-kernel-to-support-shortcut-fe.patch index 95fbdfc28..5737a0da7 100644 --- a/target/linux/generic/hack-6.0/953-net-patch-linux-kernel-to-support-shortcut-fe.patch +++ b/target/linux/generic/hack-6.0/953-net-patch-linux-kernel-to-support-shortcut-fe.patch @@ -111,7 +111,7 @@ len = skb->len; trace_net_dev_start_xmit(skb, dev); -@@ -5233,6 +5241,11 @@ void netdev_rx_handler_unregister(struct +@@ -5237,6 +5245,11 @@ void netdev_rx_handler_unregister(struct } EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister); @@ -123,7 +123,7 @@ /* * Limit the use of PFMEMALLOC reserves to those protocols that implement * the special handling of PFMEMALLOC skbs. -@@ -5281,6 +5294,10 @@ static int __netif_receive_skb_core(stru +@@ -5285,6 +5298,10 @@ static int __netif_receive_skb_core(stru int ret = NET_RX_DROP; __be16 type; @@ -134,7 +134,7 @@ net_timestamp_check(!READ_ONCE(netdev_tstamp_prequeue), skb); trace_netif_receive_skb(skb); -@@ -5318,6 +5335,15 @@ another_round: +@@ -5322,6 +5339,15 @@ another_round: goto out; } diff --git a/target/linux/generic/pending-6.0/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-6.0/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index a285b1e7b..b52b94c23 100644 --- a/target/linux/generic/pending-6.0/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-6.0/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau __u8 inner_protocol_type:1; --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -7614,6 +7614,48 @@ static void __netdev_adjacent_dev_unlink +@@ -7618,6 +7618,48 @@ static void __netdev_adjacent_dev_unlink &upper_dev->adj_list.lower); } @@ -81,7 +81,7 @@ Signed-off-by: Felix Fietkau static int __netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev, bool master, void *upper_priv, void *upper_info, -@@ -7665,6 +7707,7 @@ static int __netdev_upper_dev_link(struc +@@ -7669,6 +7711,7 @@ static int __netdev_upper_dev_link(struc if (ret) return ret; @@ -89,7 +89,7 @@ Signed-off-by: Felix Fietkau ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, &changeupper_info.info); ret = notifier_to_errno(ret); -@@ -7756,6 +7799,7 @@ static void __netdev_upper_dev_unlink(st +@@ -7760,6 +7803,7 @@ static void __netdev_upper_dev_unlink(st changeupper_info.master = netdev_master_upper_dev_get(dev) == upper_dev; @@ -97,7 +97,7 @@ Signed-off-by: Felix Fietkau call_netdevice_notifiers_info(NETDEV_PRECHANGEUPPER, &changeupper_info.info); -@@ -8813,6 +8857,7 @@ int dev_set_mac_address(struct net_devic +@@ -8817,6 +8861,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET;