mirror of
https://github.com/openwrt/openwrt.git
synced 2026-06-17 10:30:25 +04:00
Shiji Yang
9cf794cff1
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.91
Remove upstreamed patches:
- airoha/patches-6.12/017-v6.13-net-airoha-Implement-BQL-support.patch[1]
- airoha/patches-6.12/138-v7.1-net-airoha-Add-missing-RX_CPU_IDX-configuration-in-a.patch[2]
- airoha/patches-6.12/149-v7.1-net-airoha-Move-ndesc-initialization-at-end-of-airoh.patch[3]
- generic/backport-6.12/940-v7.1-net-dsa-realtek-rtl8365mb-fix-mode-mask-calculation.patch[5]
Manually rebased patches:
- airoha/patches-6.12/048-01-v6.15-net-airoha-Move-airoha_eth-driver-in-a-dedicated-fol.patch[1]
- ath79/patches-6.12/800-leds-add-reset-controller-based-driver.patch[4]
- bcm27xx/patches-6.12/950-0122-bcmgenet-Better-coalescing-parameter-defaults.patch[6]
We also backported four patches to fix perf tool regression:
- generic/backport-6.12/216-01-revert-perf-cgroup-update-metric-leader-in-evlist__e.patch
- generic/backport-6.12/216-02-revert-perf-tool_pmu-fix-aggregation-on-duration_tim.patch
- generic/backport-6.12/216-03-revert-perf-python-add-parse_events-function.patch
- generic/backport-6.12/216-04-revert-perf-tool_pmu-factor-tool-events-into-their-o.patch
All other patches are automatically refreshed.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=ca24fcac1daaa5e8a667981d81986a3eb4b9fb04
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=f00037a99bc2332ef59dc85298b98b20af165904
[3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=d36be272adda7f313e39dd118086955d993bf6a7
[4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=07d3611389ba7d78b80ea360a42ce32ab2521fbc
[5] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=3354d6c62fd4baa7b32cbd80cc5a8aa3f2bd0656
[6] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=b84351dcc359667bc952131c1424b692ec83dce2
Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/23444
(cherry picked from commit 8f638f9366)
Link: https://github.com/openwrt/openwrt/pull/23538
[Adapted to patches in 25.12]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
80 lines
2.8 KiB
Diff
80 lines
2.8 KiB
Diff
From: Qingfang Deng <dqfext@gmail.com>
|
|
Date: Sat, 1 Mar 2025 21:55:16 +0800
|
|
Subject: [PATCH] ppp: use IFF_NO_QUEUE in virtual interfaces
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
For PPPoE, PPTP, and PPPoL2TP, the start_xmit() function directly
|
|
forwards packets to the underlying network stack and never returns
|
|
anything other than 1. So these interfaces do not require a qdisc,
|
|
and the IFF_NO_QUEUE flag should be set.
|
|
|
|
Introduces a direct_xmit flag in struct ppp_channel to indicate when
|
|
IFF_NO_QUEUE should be applied. The flag is set in ppp_connect_channel()
|
|
for relevant protocols.
|
|
|
|
While at it, remove the usused latency member from struct ppp_channel.
|
|
|
|
Signed-off-by: Qingfang Deng <dqfext@gmail.com>
|
|
Reviewed-by: Toke Høiland-Jørgensen <toke@redhat.com>
|
|
Link: https://patch.msgid.link/20250301135517.695809-1-dqfext@gmail.com
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
|
|
--- a/drivers/net/ppp/ppp_generic.c
|
|
+++ b/drivers/net/ppp/ppp_generic.c
|
|
@@ -3507,6 +3507,10 @@ ppp_connect_channel(struct channel *pch,
|
|
ret = -ENOTCONN;
|
|
goto outl;
|
|
}
|
|
+ if (pch->chan->direct_xmit)
|
|
+ ppp->dev->priv_flags |= IFF_NO_QUEUE;
|
|
+ else
|
|
+ ppp->dev->priv_flags &= ~IFF_NO_QUEUE;
|
|
spin_unlock_bh(&pch->downl);
|
|
if (pch->file.hdrlen > ppp->file.hdrlen)
|
|
ppp->file.hdrlen = pch->file.hdrlen;
|
|
--- a/drivers/net/ppp/pppoe.c
|
|
+++ b/drivers/net/ppp/pppoe.c
|
|
@@ -699,6 +699,7 @@ static int pppoe_connect(struct socket *
|
|
po->chan.mtu = dev->mtu - sizeof(struct pppoe_hdr) - 2;
|
|
po->chan.private = sk;
|
|
po->chan.ops = &pppoe_chan_ops;
|
|
+ po->chan.direct_xmit = true;
|
|
|
|
error = ppp_register_net_channel(dev_net(dev), &po->chan);
|
|
if (error) {
|
|
--- a/drivers/net/ppp/pptp.c
|
|
+++ b/drivers/net/ppp/pptp.c
|
|
@@ -469,6 +469,7 @@ static int pptp_connect(struct socket *s
|
|
po->chan.mtu -= PPTP_HEADER_OVERHEAD;
|
|
|
|
po->chan.hdrlen = 2 + sizeof(struct pptp_gre_header);
|
|
+ po->chan.direct_xmit = true;
|
|
error = ppp_register_channel(&po->chan);
|
|
if (error) {
|
|
pr_err("PPTP: failed to register PPP channel (%d)\n", error);
|
|
--- a/include/linux/ppp_channel.h
|
|
+++ b/include/linux/ppp_channel.h
|
|
@@ -42,8 +42,7 @@ struct ppp_channel {
|
|
int hdrlen; /* amount of headroom channel needs */
|
|
void *ppp; /* opaque to channel */
|
|
int speed; /* transfer rate (bytes/second) */
|
|
- /* the following is not used at present */
|
|
- int latency; /* overhead time in milliseconds */
|
|
+ bool direct_xmit; /* no qdisc, xmit directly */
|
|
};
|
|
|
|
#ifdef __KERNEL__
|
|
--- a/net/l2tp/l2tp_ppp.c
|
|
+++ b/net/l2tp/l2tp_ppp.c
|
|
@@ -796,6 +796,7 @@ static int pppol2tp_connect(struct socke
|
|
po->chan.private = sk;
|
|
po->chan.ops = &pppol2tp_chan_ops;
|
|
po->chan.mtu = pppol2tp_tunnel_mtu(tunnel);
|
|
+ po->chan.direct_xmit = true;
|
|
|
|
error = ppp_register_net_channel(sock_net(sk), &po->chan);
|
|
if (error) {
|