It's amazing the amount of modifications the different SDKs and BSPs
are doing to this driver. -stable has consistently confliced with them
all for the past 5 or 6 updates .. so these sorts of things will happen
from time to time.
Thanks for the fixup, this is now merged.
Bruce
In message: [linux-yocto][v5.10/standard/x86 and
v5.10/standard/preempt-rt/x86][PATCH] net: stmmac: fix a merge error in
stmmac_main.c
on 09/12/2021 Yongxin Liu wrote:
> Fix the following build error which is introduced in merge commits
> ef48d3d353b6 ("Merge branch 'v5.10/standard/base' into v5.10/standard/x86")
> and
> c552a743a2fe ("Merge branch 'v5.10/standard/base' into
> v5.10/standard/preempt-rt/x86").
>
> linux-yocto/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c: In function
> ‘stmmac_suspend’:
> linux-yocto/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:7667:17: error:
> ‘ret’
> undeclared (first use in this function); did you mean ‘net’?
> 7667 | ret = priv->plat->remove_phy_conv(priv->mii,
> | ^~~
> | net
> linux-yocto/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:7667:17: note:
> each
> undeclared identifier is reported only once for each function it appears in
> make[6]: *** [linux-yocto/scripts/Makefile.build:280:
> drivers/net/ethernet/stmicro/stmmac/stmmac_main.o] Error 1
>
> Signed-off-by: Yongxin Liu <yongxin....@windriver.com>
> ---
> drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index ec532532c4b9..e84aec7767f1 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -7645,6 +7645,7 @@ int stmmac_suspend(struct device *dev)
> struct net_device *ndev = dev_get_drvdata(dev);
> struct stmmac_priv *priv = netdev_priv(ndev);
> u32 chan;
> + int ret;
>
> #ifdef CONFIG_STMMAC_NETWORK_PROXY
> stmmac_pm_suspend(priv, priv, ndev);
> --
> 2.31.1
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#10732):
https://lists.yoctoproject.org/g/linux-yocto/message/10732
Mute This Topic: https://lists.yoctoproject.org/mt/87607809/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
