projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 6.1 to 6.1.89
[openwrt/openwrt.git]
/
target
/
linux
/
generic
/
backport-6.1
/
790-37-v6.9-net-dsa-mt7530-remove-.mac_port_config-for-MT7988-an.patch
diff --git
a/target/linux/generic/backport-6.1/790-37-v6.9-net-dsa-mt7530-remove-.mac_port_config-for-MT7988-an.patch
b/target/linux/generic/backport-6.1/790-37-v6.9-net-dsa-mt7530-remove-.mac_port_config-for-MT7988-an.patch
index b707de87ed26771592b8dca3a15142bf90bffb2c..be6fe39f38ff63985d10de222dec8afa6393ad8f 100644
(file)
--- a/
target/linux/generic/backport-6.1/790-37-v6.9-net-dsa-mt7530-remove-.mac_port_config-for-MT7988-an.patch
+++ b/
target/linux/generic/backport-6.1/790-37-v6.9-net-dsa-mt7530-remove-.mac_port_config-for-MT7988-an.patch
@@
-33,7
+33,7
@@
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
-@@ -2
683,17 +2683
,6 @@ static bool mt753x_is_mac_port(u32 port)
+@@ -2
872,17 +2872
,6 @@ static bool mt753x_is_mac_port(u32 port)
}
static int
}
static int
@@
-51,7
+51,7
@@
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
mt7531_mac_config(struct dsa_switch *ds, int port, unsigned int mode,
phy_interface_t interface)
{
mt7531_mac_config(struct dsa_switch *ds, int port, unsigned int mode,
phy_interface_t interface)
{
-@@ -2
733,6 +2722
,9 @@ mt753x_mac_config(struct dsa_switch *ds,
+@@ -2
922,6 +2911
,9 @@ mt753x_mac_config(struct dsa_switch *ds,
{
struct mt7530_priv *priv = ds->priv;
{
struct mt7530_priv *priv = ds->priv;
@@
-61,7
+61,7
@@
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
return priv->info->mac_port_config(ds, port, mode, state->interface);
}
return priv->info->mac_port_config(ds, port, mode, state->interface);
}
-@@ -3
193,7 +318
5,6 @@ const struct mt753x_info mt753x_table[]
+@@ -3
383,7 +337
5,6 @@ const struct mt753x_info mt753x_table[]
.phy_write = mt7531_ind_phy_write,
.cpu_port_config = mt7988_cpu_port_config,
.mac_port_get_caps = mt7988_mac_port_get_caps,
.phy_write = mt7531_ind_phy_write,
.cpu_port_config = mt7988_cpu_port_config,
.mac_port_get_caps = mt7988_mac_port_get_caps,
@@
-69,7
+69,7
@@
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
},
};
EXPORT_SYMBOL_GPL(mt753x_table);
},
};
EXPORT_SYMBOL_GPL(mt753x_table);
-@@ -3
221,8 +321
2,7 @@ mt7530_probe_common(struct mt7530_priv *
+@@ -3
411,8 +340
2,7 @@ mt7530_probe_common(struct mt7530_priv *
* properly.
*/
if (!priv->info->sw_setup || !priv->info->phy_read ||
* properly.
*/
if (!priv->info->sw_setup || !priv->info->phy_read ||