Re: [PATCH 3/5] forcedeth: process TX completions using NAPI

[Jeff Garzik <jeff@garzik.org>]

[-- Attachment #1: Type: text/plain, Size: 499 bytes --]

Jeff Garzik wrote:
> commit 57cbfacc00d69be2ba02b65d1021442273b76263
> Author: Jeff Garzik <jeff@garzik.org>
> Date:   Fri Oct 5 23:25:56 2007 -0400
> 
>     [netdrvr] forcedeth: process TX completions using NAPI
>     
>     Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
> 
>  drivers/net/forcedeth.c |  143 +++++++++++++++++++++++++++---------------------
>  1 file changed, 83 insertions(+), 60 deletions(-)

The attached patch fixes an obvious bug.  Once applied, TX NAPI actually 
works :)



[-- Attachment #2: patch.fe3 --]
[-- Type: text/plain, Size: 530 bytes --]

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 1c236e6..e25c05e 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -3059,7 +3059,7 @@ static irqreturn_t nv_nic_irq_tx(int foo, void *data)
 
 static int nv_napi_tx_poll(struct napi_struct *napi, int budget)
 {
-	struct fe_priv *np = container_of(napi, struct fe_priv, napi);
+	struct fe_priv *np = container_of(napi, struct fe_priv, tx_napi);
 	struct net_device *dev = np->dev;
 	u8 __iomem *base = get_hwbase(dev);
 	unsigned long flags;