diff options
| author | John Audia <graysky@archlinux.us> | 2020-09-10 15:17:13 -0400 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-09-12 01:28:50 +0200 |
| commit | bee76f1bfa13a1dad8706090a5b6a1dd36f3d9c1 (patch) | |
| tree | ba288a8a4922007a82ede6b45292c88154044914 /target/linux/mediatek/patches-5.4/0602-net-dsa-mt7530-use-resolved-link-config-in-mac_link_.patch | |
| parent | c4110a524e9a026cf570b6dadf325c037b7527d0 (diff) | |
| download | upstream-bee76f1bfa13a1dad8706090a5b6a1dd36f3d9c1.tar.gz upstream-bee76f1bfa13a1dad8706090a5b6a1dd36f3d9c1.tar.bz2 upstream-bee76f1bfa13a1dad8706090a5b6a1dd36f3d9c1.zip | |
kernel: bump 5.4 to 5.4.64
Remove upstreamed patches:
generic-backport
701-v5.5-net-core-use-listified-Rx-for-GRO_NORMAL-in-napi_gro.patch
Manually merged:
mediatek/patches-5.4
0603-net-dsa-mt7530-Extend-device-data-ready-for-adding-a.patch
All other modifications made by update_kernel.sh
Build-tested: ipq806x, lantiq/xrx200, mvebu, x86/64
Run-tested: ipq806x (R7800), mvebu (mamba, rango),
lantiq/xrx200 (Easybox 904 xDSL), x86/64
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
[add community build/run tests to commit message]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/mediatek/patches-5.4/0602-net-dsa-mt7530-use-resolved-link-config-in-mac_link_.patch')
| -rw-r--r-- | target/linux/mediatek/patches-5.4/0602-net-dsa-mt7530-use-resolved-link-config-in-mac_link_.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/mediatek/patches-5.4/0602-net-dsa-mt7530-use-resolved-link-config-in-mac_link_.patch b/target/linux/mediatek/patches-5.4/0602-net-dsa-mt7530-use-resolved-link-config-in-mac_link_.patch index 30ce641486..ae153847dc 100644 --- a/target/linux/mediatek/patches-5.4/0602-net-dsa-mt7530-use-resolved-link-config-in-mac_link_.patch +++ b/target/linux/mediatek/patches-5.4/0602-net-dsa-mt7530-use-resolved-link-config-in-mac_link_.patch @@ -102,8 +102,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> { struct mt7530_priv *priv = ds->priv; + u32 mcr; - -- mt7530_port_set_status(priv, port, 1); ++ + mcr = PMCR_RX_EN | PMCR_TX_EN | PMCR_FORCE_LNK; + + switch (speed) { @@ -125,7 +124,8 @@ Signed-off-by: David S. Miller <davem@davemloft.net> + if (rx_pause) + mcr |= PMCR_RX_FC_EN; + } -+ + +- mt7530_port_set_status(priv, port, 1); + mt7530_set(priv, MT7530_PMCR_P(port), mcr); } |