diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2022-09-07 03:50:42 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2022-09-07 04:21:41 +0100 |
| commit | 017aea00164edca28b87910ef725a18262bac1b2 (patch) | |
| tree | cd6d494988028d5db5413806089ff5d772fb4eae /target/linux/ramips/patches-5.15 | |
| parent | 884e63fa68f717a3feb14c930cc0269f0450ef5a (diff) | |
| download | upstream-017aea00164edca28b87910ef725a18262bac1b2.tar.gz upstream-017aea00164edca28b87910ef725a18262bac1b2.tar.bz2 upstream-017aea00164edca28b87910ef725a18262bac1b2.zip | |
kernel: mtk_eth_soc: fix hw hash reporting for MT7986
Import patch from Linux 6.0.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'target/linux/ramips/patches-5.15')
| -rw-r--r-- | target/linux/ramips/patches-5.15/700-net-ethernet-mediatek-support-net-labels.patch | 4 | ||||
| -rw-r--r-- | target/linux/ramips/patches-5.15/720-Revert-net-phy-simplify-phy_link_change-arguments.patch | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ramips/patches-5.15/700-net-ethernet-mediatek-support-net-labels.patch b/target/linux/ramips/patches-5.15/700-net-ethernet-mediatek-support-net-labels.patch index 8a39c81e01..43526f3c4a 100644 --- a/target/linux/ramips/patches-5.15/700-net-ethernet-mediatek-support-net-labels.patch +++ b/target/linux/ramips/patches-5.15/700-net-ethernet-mediatek-support-net-labels.patch @@ -14,7 +14,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com> --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -@@ -3228,6 +3228,7 @@ static const struct net_device_ops mtk_n +@@ -3230,6 +3230,7 @@ static const struct net_device_ops mtk_n static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np) { @@ -22,7 +22,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com> const __be32 *_id = of_get_property(np, "reg", NULL); phy_interface_t phy_mode; struct phylink *phylink; -@@ -3347,6 +3348,9 @@ static int mtk_add_mac(struct mtk_eth *e +@@ -3349,6 +3350,9 @@ static int mtk_add_mac(struct mtk_eth *e else eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH_2K - MTK_RX_ETH_HLEN; diff --git a/target/linux/ramips/patches-5.15/720-Revert-net-phy-simplify-phy_link_change-arguments.patch b/target/linux/ramips/patches-5.15/720-Revert-net-phy-simplify-phy_link_change-arguments.patch index 063b317fd5..94e99da015 100644 --- a/target/linux/ramips/patches-5.15/720-Revert-net-phy-simplify-phy_link_change-arguments.patch +++ b/target/linux/ramips/patches-5.15/720-Revert-net-phy-simplify-phy_link_change-arguments.patch @@ -95,7 +95,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c phydev->mii_ts->link_state(phydev->mii_ts, phydev); --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c -@@ -1315,7 +1315,8 @@ void phylink_destroy(struct phylink *pl) +@@ -1323,7 +1323,8 @@ void phylink_destroy(struct phylink *pl) } EXPORT_SYMBOL_GPL(phylink_destroy); |