aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.10/731-v5.13-net-dsa-mt7530-Add-support-for-EEE-features.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-05-12 13:04:51 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-05-17 20:50:34 +0200
commit7a0af40e3746eb847aec1812294d2bd0b8c75f77 (patch)
tree49a70ca574879666d1cc27dbb05394ca929d4cd8 /target/linux/generic/backport-5.10/731-v5.13-net-dsa-mt7530-Add-support-for-EEE-features.patch
parente0aaecdbb89eed44eb15fcc7e32f68a78d84a536 (diff)
downloadupstream-7a0af40e3746eb847aec1812294d2bd0b8c75f77.tar.gz
upstream-7a0af40e3746eb847aec1812294d2bd0b8c75f77.tar.bz2
upstream-7a0af40e3746eb847aec1812294d2bd0b8c75f77.zip
kernel: bump 5.10 to 5.10.115
Removed upstreamed: backport-5.10/850-v5.17-0004-PCI-aardvark-Clear-all-MSIs-at-setup.patch pending-5.10/850-0002-PCI-aardvark-Fix-reading-MSI-interrupt-number.patch All other patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit b754b0c721131005efa7127151088e9c23dc9053)
Diffstat (limited to 'target/linux/generic/backport-5.10/731-v5.13-net-dsa-mt7530-Add-support-for-EEE-features.patch')
-rw-r--r--target/linux/generic/backport-5.10/731-v5.13-net-dsa-mt7530-Add-support-for-EEE-features.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/backport-5.10/731-v5.13-net-dsa-mt7530-Add-support-for-EEE-features.patch b/target/linux/generic/backport-5.10/731-v5.13-net-dsa-mt7530-Add-support-for-EEE-features.patch
index 38dd8a7296..48379ca9c3 100644
--- a/target/linux/generic/backport-5.10/731-v5.13-net-dsa-mt7530-Add-support-for-EEE-features.patch
+++ b/target/linux/generic/backport-5.10/731-v5.13-net-dsa-mt7530-Add-support-for-EEE-features.patch
@@ -17,7 +17,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
-@@ -2371,6 +2371,17 @@ static void mt753x_phylink_mac_link_up(s
+@@ -2372,6 +2372,17 @@ static void mt753x_phylink_mac_link_up(s
mcr |= PMCR_RX_FC_EN;
}
@@ -35,7 +35,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mt7530_set(priv, MT7530_PMCR_P(port), mcr);
}
-@@ -2601,6 +2612,36 @@ mt753x_phy_write(struct dsa_switch *ds,
+@@ -2602,6 +2613,36 @@ mt753x_phy_write(struct dsa_switch *ds,
return priv->info->phy_write(ds, port, regnum, val);
}
@@ -72,7 +72,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static const struct dsa_switch_ops mt7530_switch_ops = {
.get_tag_protocol = mtk_get_tag_protocol,
.setup = mt753x_setup,
-@@ -2629,6 +2670,8 @@ static const struct dsa_switch_ops mt753
+@@ -2630,6 +2671,8 @@ static const struct dsa_switch_ops mt753
.phylink_mac_an_restart = mt753x_phylink_mac_an_restart,
.phylink_mac_link_down = mt753x_phylink_mac_link_down,
.phylink_mac_link_up = mt753x_phylink_mac_link_up,