smc911x: fix netpoll compilation faliure
Subsystems (2)
PATCH 1/1 smc911x: fix netpoll compilation faliure
Hello folks,
the trivial patch below fixes the compilation failure for smc911x.c when NET_POLL_CONTROLLER is set.
drivers/net/smc911x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Signed-off-by Vitaly Wool <[email protected]>
drivers/net/smc911x.c +1 -1
@@ -1331,7 +1331,7 @@ smc911x_rx_dma_irq(int dma, void *data)static void smc911x_poll_controller (struct net_device *dev) {disable_irq (dev->irq); -smc911x_interrupt (dev->irq, dev,NULL ); +smc911x_interrupt (dev->irq, dev);enable_irq (dev->irq); }#endif
Quoted 14 lines · On Fri, 15 Dec 2006 16:13:28 +0300 Vitaly Wool <[email protected]> wrote:
Hello folks,
the trivial patch below fixes the compilation failure for
smc911x.cwhenNET_POLL_CONTROLLERis set.drivers/net/smc911x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Signed-off-by Vitaly Wool <[email protected]>drivers/net/smc911x.c +0
-0
drivers/net/smc911x.c smc911x_rx_dma_irq(int dma, void *data) · line 1337
Quoted 8 lines
drivers/net/smc911x.c +1
-1@@ -1331,7 +1331,7 @@ smc911x_rx_dma_irq(int dma, void *data)static void smc911x_poll_controller (struct net_device *dev) {disable_irq (dev->irq); -smc911x_interrupt (dev->irq, dev,NULL ); +smc911x_interrupt (dev->irq, dev);enable_irq (dev->irq); }#endif
That's a 2.6.19 fix, yes?
It looks like this driver needs a 2.6.20 fix also...
From: Andrew Morton <[email protected]>
Teach this driver about the workqueue changes.
Cc Vitaly Wool <[email protected]>
Cc Jeff Garzik <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
drivers/net/smc911x.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-)
drivers/net/smc911x.c renamed from drivers/net/smc911x.c~smc911-workqueue-fixes +14 -7
@@ -148,6 +148,8 @@ struct smc911x_local {int tx_throttle;spinlock_t lock; +struct net_device *netdev; +#ifdef SMC_USE_DMA /* DMA needs the physical address of the chip */ u_long physaddr;
@@ -948,10 +950,11 @@ static void smc911x_phy_check_media(stru* of autonegotiation.) If the RPC ANEG bit is cleared, the selection * is controlled by the RPC SPEED and RPC DPLX bits. */ -static void smc911x_phy_configure (void *data) +static void smc911x_phy_configure (struct work_struct *work) { -struct net_device *dev = data; -struct smc911x_local *lp =netdev_priv (dev); + struct smc911x_local *lp = container_of(work, struct smc911x_local, + phy_configure); +struct net_device *dev = lp->netdev;unsigned long ioaddr = dev->base_addr;int phyaddr = lp->mii.phy_id;int my_phy_caps;/* My PHY capabilities */
@@ -1495,6 +1498,8 @@ static void smc911x_set_multicast_list(sstatic int smc911x_open (struct net_device *dev) { +struct smc911x_local *lp =netdev_priv (dev); +DBG (SMC_DEBUG_FUNC ,"%s: --> %s\n" , dev->name, __FUNCTION__);/*
@@ -1511,7 +1516,7 @@ smc911x_open(struct net_device *dev)smc911x_reset (dev);/* Configure the PHY, initialize the link state */ -smc911x_phy_configure (dev); +smc911x_phy_configure (&lp->phy_configure);/* Turn on Tx + Rx */ smc911x_enable (dev);
@@ -2060,7 +2065,7 @@ static int __init smc911x_probe(struct n dev->poll_controller = smc911x_poll_controller;#endif -INIT_WORK (&lp->phy_configure, smc911x_phy_configure, dev); +INIT_WORK (&lp->phy_configure, smc911x_phy_configure); lp->mii.phy_id_mask =0x1f ; lp->mii.reg_num_mask =0x1f ; lp->mii.force_media =0 ;
@@ -2154,6 +2159,7 @@ static int smc911x_drv_probe(struct plat {struct net_device *ndev;struct resource *res; +struct smc911x_local *lp;unsigned int *addr;int ret;
@@ -2183,6 +2189,8 @@ static int smc911x_drv_probe(struct plat ndev->dma = (unsigned char )-1 ; ndev->irq =platform_get_irq (pdev,0 ); + lp =netdev_priv (ndev); + lp->netdev = ndev; addr =ioremap (res->start,SMC911X_IO_EXTENT );if (!addr) {
@@ -2204,7 +2212,6 @@ out: }#ifdef SMC_USE_DMA else { -struct smc911x_local *lp =netdev_priv (ndev); lp->physaddr = res->start; lp->dev = &pdev->dev; }
@@ -2275,7 +2282,7 @@ static int smc911x_drv_resume(struct plasmc911x_reset (ndev);smc911x_enable (ndev);if (lp->phy_type !=0 ) -smc911x_phy_configure (ndev); +smc911x_phy_configure (&lp->phy_configure);netif_device_attach (ndev); } }
_