Patchwork smsc911x: compile fix re netif_rx signature changes

login
register
mail settings
Submitter Alexey Dobriyan
Date Dec. 29, 2008, 11:57 a.m.
Message ID <20081229115706.GA21117@x200.localdomain>
Download mbox | patch
Permalink /patch/15912/
State Accepted
Delegated to: David Miller
Headers show

Comments

Alexey Dobriyan - Dec. 29, 2008, 11:57 a.m.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---

 drivers/net/smsc911x.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--
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
Steve Glendinning - Dec. 29, 2008, 4:43 p.m.
Thanks Alexey.

Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>

> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
> ---
> 
>  drivers/net/smsc911x.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> --- a/drivers/net/smsc911x.c
> +++ b/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");
> --
> 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

--
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
David Miller - Dec. 30, 2008, 2:22 a.m.
From: Steve.Glendinning@smsc.com
Date: Mon, 29 Dec 2008 16:43:41 +0000

> Thanks Alexey.
> 
> Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
> 
> > Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>

Applied, thanks everyone.
--
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

Patch

--- a/drivers/net/smsc911x.c
+++ b/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");