From 600e886e3d986a3f44af546ca42d20d2490bc8fa Mon Sep 17 00:00:00 2001 From: Malli Chilakala Date: Fri, 17 Jun 2005 17:31:44 -0700 Subject: [PATCH] --- yaml --- r: 3586 b: refs/heads/master c: 0685c31b58a69e41393e974f6e6b8e0a4eadcf0b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/e100.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3fbb9b432930..d173e3239d23 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f92d872876617cddbb0532291034f88941e855fd +refs/heads/master: 0685c31b58a69e41393e974f6e6b8e0a4eadcf0b diff --git a/trunk/drivers/net/e100.c b/trunk/drivers/net/e100.c index 8c7e2d17e75f..1e56c8eea35f 100644 --- a/trunk/drivers/net/e100.c +++ b/trunk/drivers/net/e100.c @@ -1671,8 +1671,10 @@ static irqreturn_t e100_intr(int irq, void *dev_id, struct pt_regs *regs) if(stat_ack & stat_ack_rnr) nic->ru_running = RU_SUSPENDED; - e100_disable_irq(nic); - netif_rx_schedule(netdev); + if(likely(netif_rx_schedule_prep(netdev))) { + e100_disable_irq(nic); + __netif_rx_schedule(netdev); + } return IRQ_HANDLED; }