The patch titled
via-rhine: NAPI poll enable
has been added to the -mm tree. Its filename is
via-rhine-napi-poll-enable.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: via-rhine: NAPI poll enable
From: Stephen Hemminger <shemminger@xxxxxxxx>
The poll_enable should be in init_registers before enabling interrupts, not
in tx_timeout. Thanks for spotting it Roger.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxx>
Cc: Roger Luethi <rl@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/via-rhine.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN drivers/net/via-rhine.c~via-rhine-napi-poll-enable drivers/net/via-rhine.c
--- a/drivers/net/via-rhine.c~via-rhine-napi-poll-enable
+++ a/drivers/net/via-rhine.c
@@ -1048,6 +1048,8 @@ static void init_registers(struct net_de
rhine_set_rx_mode(dev);
+ netif_poll_enable(dev);
+
/* Enable interrupts by setting the interrupt mask. */
iowrite16(IntrRxDone | IntrRxErr | IntrRxEmpty| IntrRxOverflow |
IntrRxDropped | IntrRxNoBuf | IntrTxAborted |
@@ -1199,7 +1201,6 @@ static void rhine_tx_timeout(struct net_
dev->trans_start = jiffies;
rp->stats.tx_errors++;
netif_wake_queue(dev);
- netif_poll_enable(dev);
}
static int rhine_start_tx(struct sk_buff *skb, struct net_device *dev)
_
Patches currently in -mm which might be from shemminger@xxxxxxxx are
origin.patch
git-netdev-all.patch
qla3xxx-NIC-driver.patch
via-rhine-napi-support.patch
via-rhine-napi-poll-enable.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
