From 191d09e7414370e2d85eb7e18a58fc6ff8d436c9 Mon Sep 17 00:00:00 2001 From: Alexey Dobriyan Date: Mon, 29 Dec 2008 18:22:43 -0800 Subject: [PATCH] --- yaml --- r: 123993 b: refs/heads/master c: 36f8b9238373751b684650871fd161546b10116c h: refs/heads/master i: 123991: 3bdf922c4cc867ca0035179bf0c296cf4ed82de9 v: v3 --- [refs] | 2 +- trunk/drivers/net/smsc911x.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4639cb113fa7..3858c49fdc17 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8eb79863962bbf18ebf648335e329bfd468432fa +refs/heads/master: 36f8b9238373751b684650871fd161546b10116c diff --git a/trunk/drivers/net/smsc911x.c b/trunk/drivers/net/smsc911x.c index 5e989d884ddd..dc3f1108884d 100644 --- a/trunk/drivers/net/smsc911x.c +++ b/trunk/drivers/net/smsc911x.c @@ -1484,13 +1484,13 @@ static irqreturn_t smsc911x_irqhandler(int irq, void *dev_id) } if (likely(intsts & inten & INT_STS_RSFL_)) { - if (likely(netif_rx_schedule_prep(dev, &pdata->napi))) { + if (likely(netif_rx_schedule_prep(&pdata->napi))) { /* Disable Rx interrupts */ temp = smsc911x_reg_read(pdata, INT_EN); temp &= (~INT_EN_RSFL_EN_); smsc911x_reg_write(pdata, INT_EN, temp); /* Schedule a NAPI poll */ - __netif_rx_schedule(dev, &pdata->napi); + __netif_rx_schedule(&pdata->napi); } else { SMSC_WARNING(RX_ERR, "netif_rx_schedule_prep failed");