Re: linux-next: build failure after merge of the net-next tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, 6 Oct 2021 12:23:15 +1100 Stephen Rothwell wrote:
> Hi all,
> 
> After merging the net-next tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/net/ethernet/toshiba/ps3_gelic_net.c: In function 'gelic_net_setup_netdev':
> drivers/net/ethernet/toshiba/ps3_gelic_net.c:1480:26: error: passing argument 2 of 'eth_hw_addr_set' from incompatible pointer type [-Werror=incompatible-pointer-types]
>  1480 |  eth_hw_addr_set(netdev, &v1);
>       |                          ^~~
>       |                          |
>       |                          u64 * {aka long long unsigned int *}
> In file included from drivers/net/ethernet/toshiba/ps3_gelic_net.c:23:
> include/linux/etherdevice.h:309:70: note: expected 'const u8 *' {aka 'const unsigned char *'} but argument is of type 'u64 *' {aka 'long long unsigned int *'}
>   309 | static inline void eth_hw_addr_set(struct net_device *dev, const u8 *addr)
>       |                                                            ~~~~~~~~~~^~~~
> 
> Caused by commit
> 
>   a96d317fb1a3 ("ethernet: use eth_hw_addr_set()")
> 
> I have applied the following patch for today.
> 
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Wed, 6 Oct 2021 12:19:08 +1100
> Subject: [PATCH] ethernet: fix up ps3_gelic_net.c for "ethernet: use
>  eth_hw_addr_set()"
> 
> Fixes: a96d317fb1a3 ("ethernet: use eth_hw_addr_set()")
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> ---
>  drivers/net/ethernet/toshiba/ps3_gelic_net.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_net.c b/drivers/net/ethernet/toshiba/ps3_gelic_net.c
> index 1425623b868e..3dbfb1b20649 100644
> --- a/drivers/net/ethernet/toshiba/ps3_gelic_net.c
> +++ b/drivers/net/ethernet/toshiba/ps3_gelic_net.c
> @@ -1477,7 +1477,7 @@ int gelic_net_setup_netdev(struct net_device *netdev, struct gelic_card *card)
>  			 __func__, status);
>  		return -EINVAL;
>  	}
> -	eth_hw_addr_set(netdev, &v1);
> +	eth_hw_addr_set(netdev, (u8 *)&v1);
>  
>  	if (card->vlan_required) {
>  		netdev->hard_header_len += VLAN_HLEN;

Applied, thanks. Is this the last one? ;)

I wonder what happened to the kbuild bot :S



[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux