merged.
Bruce
In message: [linux-yocto][branch v6.1/standard/nxp-sdk-6.1/nxp-soc &
v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc][PATCH 1/2] net: stmmac: Fix build
error fpe_cfg undeclared
on 23/03/2024 Xiaolei Wang wrote:
> Use priv->plat->fpe_cfg instead of fpe_cfg to avoid fpe_cfg undeclared
>
> Fixes: b102a918b11cb ("net: stmmac: add ethtool preempt support")
> Signed-off-by: Xiaolei Wang <[email protected]>
> ---
> drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
> b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
> index e483caafbdda..7e396b6976e6 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
> @@ -1221,7 +1221,7 @@ static int stmmac_set_preempt(struct net_device *dev,
> struct ethtool_fp *fpcmd)
> priv->plat->fpe_cfg->enable = 1;
> priv->fp_enabled_admin = 1;
> }
> - stmmac_fpe_configure(priv, priv->ioaddr, fpe_cfg,
> + stmmac_fpe_configure(priv, priv->ioaddr, priv->plat->fpe_cfg,
> priv->plat->tx_queues_to_use,
> priv->plat->rx_queues_to_use, fpe.enable, &fpe);
>
> --
> 2.25.1
>
In message: [linux-yocto][branch v6.1/standard/nxp-sdk-6.1/nxp-soc &
v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc][PATCH 2/2] net: stmmac: Fix build
error too few parameters
on 23/03/2024 Xiaolei Wang wrote:
> Since commit ed7e211b6786 ("net: stmmac: fix FPE events losing")
> adds the fpe_cfg parameter, add it to avoid build errors.
>
> error: too few arguments to function 'priv->hw->mac->fpe_send_mpacket'
>
> Signed-off-by: Xiaolei Wang <[email protected]>
> ---
> drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index 034ae1dc65ec..859af9117a0f 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -958,7 +958,7 @@ static void stmmac_fpe_link_state_handle(struct
> stmmac_priv *priv, bool is_up)
>
> if (is_up) {
> if (*hs_enable)
> - stmmac_fpe_send_mpacket(priv, priv->ioaddr,
> MPACKET_VERIFY);
> + stmmac_fpe_send_mpacket(priv, priv->ioaddr, fpe_cfg,
> MPACKET_VERIFY);
> } else {
> *lo_state = FPE_STATE_OFF;
> *lp_state = FPE_STATE_OFF;
> --
> 2.25.1
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13747):
https://lists.yoctoproject.org/g/linux-yocto/message/13747
Mute This Topic: https://lists.yoctoproject.org/mt/105197595/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
