Re: [PATCH -queue] MIPS/net: fix au1000_eth.c build and warnings

[Florian Fainelli <florian@openwrt.org>]

Hi Manuel,

On Monday 15 February 2010 20:43:37 Manuel Lauss wrote:
> - buildfix: DECLARE_MAC_BUF was removed recently.
> - remove various warnings spit out during build
> 
> Only compile-tested.
> 
> Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
> ---
> Hi Ralf!  Please fold this into the patch titled
> "NET: au1000-eth: convert to platform_driver model"
> in mips-queue, thank you!
> 
>  drivers/net/au1000_eth.c |   14 +++++++-------
>  1 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c
> index 1acf2c1..6e5a68e 100644
> --- a/drivers/net/au1000_eth.c
> +++ b/drivers/net/au1000_eth.c
> @@ -397,11 +397,12 @@ static int mii_probe (struct net_device *dev)
>                               /* find the first (lowest address) non-attached 
> PHY on
>                                * the MAC0 MII bus */
>                               for (phy_addr = 0; phy_addr < PHY_MAX_ADDR; 
> phy_addr++) {
> -                                     if (aup->mac_id == 1)
> -                                             break;
>                                       struct phy_device *const tmp_phydev =
>                                                       
> aup->mii_bus->phy_map[phy_addr];
> 
> +                                     if (aup->mac_id == 1)
> +                                             break;
> +
>                                       if (!tmp_phydev)
>                                               continue; /* no PHY here... */
> 
> @@ -650,7 +651,6 @@ static int au1000_init(struct net_device *dev)
> 
>  static inline void update_rx_stats(struct net_device *dev, u32 status)
>  {
> -     struct au1000_private *aup = netdev_priv(dev);
>       struct net_device_stats *ps = &dev->stats;
> 
>       ps->rx_packets++;
> @@ -908,7 +908,7 @@ static netdev_tx_t au1000_tx(struct sk_buff *skb,
>  struct net_device *dev) }
> 
>       pDB = aup->tx_db_inuse[aup->tx_head];
> -     skb_copy_from_linear_data(skb, pDB->vaddr, skb->len);
> +     skb_copy_from_linear_data(skb, (void *)pDB->vaddr, skb->len);
>       if (skb->len < ETH_ZLEN) {
>               for (i=skb->len; i<ETH_ZLEN; i++) {
>                       ((char *)pDB->vaddr)[i] = 0;
> @@ -1006,7 +1006,7 @@ static int __devinit au1000_probe(struct
>  platform_device *pdev) db_dest_t *pDB, *pDBfree;
>       int irq, i, err = 0;
>       struct resource *base, *macen;
> -     DECLARE_MAC_BUF(ethaddr);
> +     char ethaddr[6];

That hunk is already in net-next-2.6.
--
Florian
-- 
Regards, Florian