MIPS/net: fix au1000_eth.c build and warnings
Subsystems (2)
PATCH 1/1 MIPS/net: fix au1000_eth.c build and warnings
- buildfix: DECLARE_MAC_BUF was removed recently.
- remove various warnings spit out during build
Only compile-tested.
---
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(-)
drivers/net/au1000_eth.c +7 -7
@@ -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 ]; base =platform_get_resource (pdev,IORESOURCE_MEM ,0 );if (!base) {
@@ -1207,8 +1207,8 @@ static int __devinit au1000_probe(struct platform_device *pdev) goto err_out; } -printk ("%s: Au1xx0 Ethernet found at 0x%x, irq %d\n" , - dev->name, base->start, irq); +printk ("%s: Au1xx0 Ethernet found at 0x%lx, irq %d\n" , + dev->name, (unsigned long )base->start, irq);if (version_printed++ ==0 )printk ("%s version %s %s\n" ,DRV_NAME ,DRV_VERSION ,DRV_AUTHOR );
Signature · 1 line
1.6.6.1
Quoted 10 lines · Manuel Lauss
- buildfix:
DECLARE_MAC_BUFwas removed recently.
- remove various warnings spit out during buildOnly compile-tested.
Signed-off-by Manuel Lauss <[email protected]>---
Hi Ralf! Please fold this into the patch titled "NET: au1000-eth: convert toplatform_drivermodel" in mips-queue, thank you!
Done - but as this is a net patch it should have been cc'ed to netdev / DaveM as well ...
Ralf
Hi Manuel,
Quoted 51 lines · On Monday 15 February 2010 20:43:37 Manuel Lauss wrote:
- buildfix:
DECLARE_MAC_BUFwas removed recently.
- remove various warnings spit out during buildOnly compile-tested.
Signed-off-by Manuel Lauss <[email protected]>---
Hi Ralf! Please fold this into the patch titled "NET: au1000-eth: convert toplatform_drivermodel" in mips-queue, thank you!drivers/net/au1000_eth.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)drivers/net/au1000_eth.c +4
-4@@ -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 ;
drivers/net/au1000_eth.c static int __devinit au1000_probe(struct · line 1009
Quoted 5 lines
drivers/net/au1000_eth.c +1
-1@@ -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
Signature · 1 line
Regards, Florian
Quoted 8 lines · Florian Fainelli
drivers/net/au1000_eth.c static int __devinit au1000_probe(struct · line 1009
Quoted 6 lines
drivers/net/au1000_eth.c +1
-1@@ -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.
Fortunately this doesn't cause a merge conflict.
Ralf