merged.
Bruce
In message: [linux-yocto][v5.15/standard/x86 &
v5.15/standard/preempt-rt/x86][PATCH 1/1] Revert "i40e: fix build warning in
ice_fltr_add_mac_to_list()"
on 29/06/2023 Liwei Song wrote:
> This reverts commit 0dfc81a283d43ea2398065857a56b991f14f4e71.
>
> Since ice driver was already updated to the latest version, upstream
> commit 5e24d5984c80 ("ice: Use int for ice_status") referred in this
> linux-stable specific patch was applied, so the stable one was not
> needed anymore, also it should be "ice" but not "i40e", so revert
> this one to fix "conflicting types" build error.
>
> Signed-off-by: Liwei Song <liwei.s...@windriver.com>
> ---
> drivers/net/ethernet/intel/ice/ice_fltr.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/intel/ice/ice_fltr.c
> b/drivers/net/ethernet/intel/ice/ice_fltr.c
> index d0d9e60471b9..aff7a141c30d 100644
> --- a/drivers/net/ethernet/intel/ice/ice_fltr.c
> +++ b/drivers/net/ethernet/intel/ice/ice_fltr.c
> @@ -222,7 +222,7 @@ void ice_fltr_remove_all(struct ice_vsi *vsi)
> * @mac: MAC address to add
> * @action: filter action
> */
> -enum ice_status
> +int
> ice_fltr_add_mac_to_list(struct ice_vsi *vsi, struct list_head *list,
> const u8 *mac, enum ice_sw_fwd_act_type action)
> {
> --
> 2.40.0
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12834):
https://lists.yoctoproject.org/g/linux-yocto/message/12834
Mute This Topic: https://lists.yoctoproject.org/mt/99850332/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe:
https://lists.yoctoproject.org/g/linux-yocto/leave/6687884/21656/624485779/xyzzy
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
