The patch titled
git-net: make mv643xx_eth.c build again
has been removed from the -mm tree. Its filename was
make-mv643xx_ethc-build-again.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: git-net: make mv643xx_eth.c build again
From: jfannin@xxxxxxxxx (Joseph Fannin)
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 <jfannin@xxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/mv643xx_eth.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN drivers/net/mv643xx_eth.c~make-mv643xx_ethc-build-again drivers/net/mv643xx_eth.c
--- a/drivers/net/mv643xx_eth.c~make-mv643xx_ethc-build-again
+++ a/drivers/net/mv643xx_eth.c
@@ -65,7 +65,7 @@ static int mv643xx_eth_stop(struct net_d
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 @@ static irqreturn_t mv643xx_eth_int_handl
/* 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)
_
Patches currently in -mm which might be from jfannin@xxxxxxxxx are
git-net.patch
remove-broken-netfilter-binary-sysctls-from-bridging-code.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
