diff options
| author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-12-31 19:25:45 +0100 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2021-01-01 17:07:28 +0100 |
| commit | 9b1b89229f0efef43a738f91875e0fd9fcc42277 (patch) | |
| tree | 14d5481d6daa9852dd36554e26e10517651c141f /target/linux/mediatek/patches-5.4/0600-net-phylink-propagate-resolved-link-config-via-mac_l.patch | |
| parent | c22b689cf89f5a17ed6e35c1fb92c19b4a7126ae (diff) | |
| download | upstream-9b1b89229f0efef43a738f91875e0fd9fcc42277.tar.gz upstream-9b1b89229f0efef43a738f91875e0fd9fcc42277.tar.bz2 upstream-9b1b89229f0efef43a738f91875e0fd9fcc42277.zip | |
kernel: bump 5.4 to 5.4.86
Removed upstreamed patches:
pending-5.4/499-mtd-parser-cmdline-Fix-parsing-of-part-names-with-co.patch
Manually merged:
pending-5.4/611-netfilter_match_bypass_default_table.patch
layerscape/302-dts-0112-arm64-dts-fsl-ls1028a-prepare-dts-for-overlay.patch
Build-tested: ipq806x/R7800, bcm27xx/bcm2711, ath79/{generic,tiny},
ipq40xx, octeon, ramips/mt7621, realtek, x86/64
Run-tested: ipq806x/R7800, realtek
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Tested-by: John Audia <graysky@archlinux.us>
Tested-by: Stijn Segers <foss@volatilesystems.org>
Diffstat (limited to 'target/linux/mediatek/patches-5.4/0600-net-phylink-propagate-resolved-link-config-via-mac_l.patch')
| -rw-r--r-- | target/linux/mediatek/patches-5.4/0600-net-phylink-propagate-resolved-link-config-via-mac_l.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/mediatek/patches-5.4/0600-net-phylink-propagate-resolved-link-config-via-mac_l.patch b/target/linux/mediatek/patches-5.4/0600-net-phylink-propagate-resolved-link-config-via-mac_l.patch index b6734a38dc..96fa3be1ef 100644 --- a/target/linux/mediatek/patches-5.4/0600-net-phylink-propagate-resolved-link-config-via-mac_l.patch +++ b/target/linux/mediatek/patches-5.4/0600-net-phylink-propagate-resolved-link-config-via-mac_l.patch @@ -95,7 +95,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> } netif_tx_start_all_queues(port->dev); -@@ -5125,8 +5129,11 @@ static void mvpp2_mac_config(struct phyl +@@ -5126,8 +5130,11 @@ static void mvpp2_mac_config(struct phyl mvpp2_port_enable(port); } @@ -107,8 +107,8 @@ Signed-off-by: David S. Miller <davem@davemloft.net> + int speed, int duplex, + bool tx_pause, bool rx_pause) { - struct net_device *dev = to_net_dev(config->dev); - struct mvpp2_port *port = netdev_priv(dev); + struct mvpp2_port *port = mvpp2_phylink_to_port(config); + u32 val; --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -449,9 +449,10 @@ static void mtk_mac_link_down(struct phy |