kernel: bump 5.10 to 5.10.110
Removed upstreamed: generic/backport-5.10/350-v5.18-MIPS-pgalloc-fix-memory-leak-caused-by-pgd_free.patch generic/pending-5.10/850-0014-PCI-aardvark-Fix-reading-PCI_EXP_RTSTA_PME-bit-on-em.patch ipq40xx/patches-5.10/105-ipq40xx-fix-sleep-clock.patch All patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Compile-/run-tested: ath79/generic (Archer C7 v2). Signed-off-by: John Audia <graysky@archlinux.us>
This commit is contained in:
committed by
Hauke Mehrtens
parent
be381a7ac7
commit
b92ec82235
@@ -14,7 +14,7 @@ Signed-off-by: DENG Qingfang <dqfext@gmail.com>
|
||||
|
||||
--- a/drivers/net/dsa/mt7530.c
|
||||
+++ b/drivers/net/dsa/mt7530.c
|
||||
@@ -1000,9 +1000,6 @@ mt753x_cpu_port_enable(struct dsa_switch
|
||||
@@ -998,9 +998,6 @@ mt753x_cpu_port_enable(struct dsa_switch
|
||||
mt7530_write(priv, MT7530_PVC_P(port),
|
||||
PORT_SPEC_TAG);
|
||||
|
||||
@@ -24,7 +24,7 @@ Signed-off-by: DENG Qingfang <dqfext@gmail.com>
|
||||
/* Set CPU port number */
|
||||
if (priv->id == ID_MT7621)
|
||||
mt7530_rmw(priv, MT7530_MFC, CPU_MASK, CPU_EN | CPU_PORT(port));
|
||||
@@ -1138,6 +1135,20 @@ mt7530_stp_state_set(struct dsa_switch *
|
||||
@@ -1131,6 +1128,20 @@ mt7530_stp_state_set(struct dsa_switch *
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -45,7 +45,7 @@ Signed-off-by: DENG Qingfang <dqfext@gmail.com>
|
||||
mt7530_port_bridge_join(struct dsa_switch *ds, int port,
|
||||
struct net_device *bridge)
|
||||
{
|
||||
@@ -1357,6 +1368,63 @@ err:
|
||||
@@ -1331,6 +1342,63 @@ err:
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -109,7 +109,7 @@ Signed-off-by: DENG Qingfang <dqfext@gmail.com>
|
||||
mt7530_vlan_cmd(struct mt7530_priv *priv, enum mt7530_vlan_cmd cmd, u16 vid)
|
||||
{
|
||||
struct mt7530_dummy_poll p;
|
||||
@@ -2794,11 +2862,15 @@ static const struct dsa_switch_ops mt753
|
||||
@@ -2745,11 +2813,15 @@ static const struct dsa_switch_ops mt753
|
||||
.port_change_mtu = mt7530_port_change_mtu,
|
||||
.port_max_mtu = mt7530_port_max_mtu,
|
||||
.port_stp_state_set = mt7530_stp_state_set,
|
||||
|
||||
Reference in New Issue
Block a user