netdev
[Top] [All Lists]

mv643xx(10/20): compile fix for non-NAPI case

To: Netdev <netdev@xxxxxxxxxxx>, Jeff Garzik <jgarzik@xxxxxxxxx>
Subject: mv643xx(10/20): compile fix for non-NAPI case
From: "Dale Farnsworth" <dale@xxxxxxxxxxxxxx>
Date: Mon, 28 Mar 2005 16:49:50 -0700
Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx>, Manish Lachwani <mlachwani@xxxxxxxxxx>, Brian Waite <brian@xxxxxxxxxxxxxx>, "Steven J. Hill" <sjhill@xxxxxxxxxxxxxxxxxx>, Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>, James Chapman <jchapman@xxxxxxxxxxx>
In-reply-to: <20050328233807.GA28423@xyzzy>
References: <20050328233807.GA28423@xyzzy>
Sender: netdev-bounce@xxxxxxxxxxx
User-agent: Mutt/1.5.6+20040907i
Compiles for the non-NAPI configuration were broken. 

Signed-off-by: James Chapman <jchapman@xxxxxxxxxxx>
Acked-by: Dale Farnsworth <dale@xxxxxxxxxxxxxx>

Index: linux-2.5-enet/drivers/net/mv643xx_eth.c
===================================================================
--- linux-2.5-enet.orig/drivers/net/mv643xx_eth.c
+++ linux-2.5-enet/drivers/net/mv643xx_eth.c
@@ -561,9 +561,10 @@
                                                                (port_num), 0);
                        __netif_rx_schedule(dev);
                }
+       }
 #else
                if (eth_int_cause & (BIT2 | BIT11))
-                       mv643xx_eth_receive_queue(dev, 0);
+                       mv643xx_eth_receive_queue(dev);
 
                /*
                 * After forwarded received packets to upper layer, add a task
@@ -580,7 +581,6 @@
                mp->rx_task.func(dev);
 #endif
 #endif
-       }
        /* PHY status changed */
        if (eth_int_cause_ext & (BIT16 | BIT20)) {
                struct ethtool_cmd cmd;

<Prev in Thread] Current Thread [Next in Thread>