aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/gianfar.c
diff options
context:
space:
mode:
authorNeil Horman <nhorman@tuxdriver.com>2008-12-22 23:43:12 -0500
committerDavid S. Miller <davem@davemloft.net>2008-12-22 23:43:12 -0500
commit908a7a16b852ffd618a9127be8d62432182d81b4 (patch)
treea0b509227e26bef7edd347575761e0dbeb5756e7 /drivers/net/gianfar.c
parent889bd9b6dbcd426b8698c4a779dd7dbf247f57b8 (diff)
net: Remove unused netdev arg from some NAPI interfaces.
When the napi api was changed to separate its 1:1 binding to the net_device struct, the netif_rx_[prep|schedule|complete] api failed to remove the now vestigual net_device structure parameter. This patch cleans up that api by properly removing it.. Signed-off-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/gianfar.c')
-rw-r--r--drivers/net/gianfar.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 13f49643ba0b..c672ecfc9595 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -1607,9 +1607,9 @@ static int gfar_clean_tx_ring(struct net_device *dev)
1607static void gfar_schedule_cleanup(struct net_device *dev) 1607static void gfar_schedule_cleanup(struct net_device *dev)
1608{ 1608{
1609 struct gfar_private *priv = netdev_priv(dev); 1609 struct gfar_private *priv = netdev_priv(dev);
1610 if (netif_rx_schedule_prep(dev, &priv->napi)) { 1610 if (netif_rx_schedule_prep(&priv->napi)) {
1611 gfar_write(&priv->regs->imask, IMASK_RTX_DISABLED); 1611 gfar_write(&priv->regs->imask, IMASK_RTX_DISABLED);
1612 __netif_rx_schedule(dev, &priv->napi); 1612 __netif_rx_schedule(&priv->napi);
1613 } 1613 }
1614} 1614}
1615 1615
@@ -1863,7 +1863,7 @@ static int gfar_poll(struct napi_struct *napi, int budget)
1863 return budget; 1863 return budget;
1864 1864
1865 if (rx_cleaned < budget) { 1865 if (rx_cleaned < budget) {
1866 netif_rx_complete(dev, napi); 1866 netif_rx_complete(napi);
1867 1867
1868 /* Clear the halt bit in RSTAT */ 1868 /* Clear the halt bit in RSTAT */
1869 gfar_write(&priv->regs->rstat, RSTAT_CLEAR_RHALT); 1869 gfar_write(&priv->regs->rstat, RSTAT_CLEAR_RHALT);