| Message ID | 20110825150249.GA21897@electric-eye.fr.zoreil.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Francois Romieu <romieu@fr.zoreil.com> Date: Thu, 25 Aug 2011 17:02:49 +0200 > Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> > Spotted-by: Thomas Jarosch <thomas.jarosch@intra2net.com> Applied, thanks! > David, any opinion regarding the removal of the USE_NAPI #ifdef > in this driver ? No objections to removing it. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c index 646c86b..fdb7a17 100644 --- a/drivers/net/cassini.c +++ b/drivers/net/cassini.c @@ -2452,14 +2452,13 @@ static irqreturn_t cas_interruptN(int irq, void *dev_id) struct net_device *dev = dev_id; struct cas *cp = netdev_priv(dev); unsigned long flags; - int ring; + int ring = (irq == cp->pci_irq_INTC) ? 2 : 3; u32 status = readl(cp->regs + REG_PLUS_INTRN_STATUS(ring)); /* check for shared irq */ if (status == 0) return IRQ_NONE; - ring = (irq == cp->pci_irq_INTC) ? 2 : 3; spin_lock_irqsave(&cp->lock, flags); if (status & INTR_RX_DONE_ALT) { /* handle rx separately */ #ifdef USE_NAPI
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Spotted-by: Thomas Jarosch <thomas.jarosch@intra2net.com> --- David, any opinion regarding the removal of the USE_NAPI #ifdef in this driver ? drivers/net/cassini.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)