The changeset to "Make NAPI polling independent of struct net_device
objects" forgot to change a function prototype in mv643xx_eth.c, and
also introduced a typo that caused the driver not to build.
Signed-off-by: Joseph Fannin <[email protected]>
---
This is build-tested only.
diff -ru linux-2.6.23-rc6-mm1.orig/drivers/net/mv643xx_eth.c linux-2.6.23-rc6-mm1/drivers/net/mv643xx_eth.c
--- linux-2.6.23-rc6-mm1.orig/drivers/net/mv643xx_eth.c 2007-09-20 18:17:41.000000000 -0400
+++ linux-2.6.23-rc6-mm1/drivers/net/mv643xx_eth.c 2007-09-20 18:17:11.000000000 -0400
@@ -65,7 +65,7 @@
static int mv643xx_eth_change_mtu(struct net_device *, int);
static void eth_port_init_mac_tables(unsigned int eth_port_num);
#ifdef MV643XX_NAPI
-static int mv643xx_poll(struct net_device *dev, int budget);
+static int mv643xx_poll(struct napi_struct *napi, int budget);
#endif
static int ethernet_phy_get(unsigned int eth_port_num);
static void ethernet_phy_set(unsigned int eth_port_num, int phy_addr);
@@ -561,7 +561,7 @@
/* wait for previous write to complete */
mv_read(MV643XX_ETH_INTERRUPT_MASK_REG(port_num));
- netif_rx_schedule(dev, &bp->napi);
+ netif_rx_schedule(dev, &mp->napi);
}
#else
if (eth_int_cause & ETH_INT_CAUSE_RX)
--
Joseph Fannin
[email protected]