Re: sungem driver patch testing..

[Christoph Hellwig <hch@infradead.org>]

On Sat, Sep 10, 2005 at 08:11:22PM -0700, Linus Torvalds wrote:
> 
> I've been grepping around for things that do their own PCI ROM mapping and 
> do it badly, and one thing that matches that description is the sungem 
> ethernet driver on PC's.
> 
> If anybody has such a beast, can you please try this patch and report 
> whether it works for you? 
> 
> 		Linus
> 
> ---
> diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
> --- a/drivers/net/sungem.c
> +++ b/drivers/net/sungem.c
> @@ -2817,7 +2817,7 @@ static int gem_ioctl(struct net_device *
>  
>  #if (!defined(__sparc__) && !defined(CONFIG_PPC_PMAC))
>  /* Fetch MAC address from vital product data of PCI ROM. */
> -static void find_eth_addr_in_vpd(void __iomem *rom_base, int len, unsigned char *dev_addr)
> +static int find_eth_addr_in_vpd(void __iomem *rom_base, int len, unsigned char *dev_addr)

While we're at it the cpp conditioal looks bogus.  We definitly needs this
when plugging a SUN card into a mac.  I'd suggest compiling this
unconditionally and fall back to it when whatever firmware method to get
the mac address fails.