From patchwork Mon Jan 12 01:04:12 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Krzysztof Halasa X-Patchwork-Id: 17866 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 488F3DE012 for ; Mon, 12 Jan 2009 12:04:23 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751880AbZALBEQ (ORCPT ); Sun, 11 Jan 2009 20:04:16 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751836AbZALBEQ (ORCPT ); Sun, 11 Jan 2009 20:04:16 -0500 Received: from khc.piap.pl ([195.187.100.11]:45566 "EHLO khc.piap.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751744AbZALBEP convert rfc822-to-8bit (ORCPT ); Sun, 11 Jan 2009 20:04:15 -0500 Received: by khc.piap.pl (Postfix, from userid 500) id 44FEA70190; Mon, 12 Jan 2009 02:04:12 +0100 (CET) To: David Miller Cc: Subject: [PATCH] WAN: Fix NAPI interface in IXP4xx HSS driver. From: Krzysztof Halasa Date: Mon, 12 Jan 2009 02:04:12 +0100 Message-ID: MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org WAN: Fix NAPI interface in IXP4xx HSS driver. Signed-off-by: Krzysztof Hałasa diff --git a/drivers/net/wan/ixp4xx_hss.c b/drivers/net/wan/ixp4xx_hss.c index 2dc2416..0dbd85b 100644 --- a/drivers/net/wan/ixp4xx_hss.c +++ b/drivers/net/wan/ixp4xx_hss.c @@ -622,7 +622,7 @@ static void hss_hdlc_rx_irq(void *pdev) printk(KERN_DEBUG "%s: hss_hdlc_rx_irq\n", dev->name); #endif qmgr_disable_irq(queue_ids[port->id].rx); - netif_rx_schedule(dev, &port->napi); + netif_rx_schedule(&port->napi); } static int hss_hdlc_poll(struct napi_struct *napi, int budget) @@ -651,7 +651,7 @@ static int hss_hdlc_poll(struct napi_struct *napi, int budget) printk(KERN_DEBUG "%s: hss_hdlc_poll" " netif_rx_complete\n", dev->name); #endif - netif_rx_complete(dev, napi); + netif_rx_complete(napi); qmgr_enable_irq(rxq); if (!qmgr_stat_empty(rxq) && netif_rx_reschedule(napi)) { @@ -1069,7 +1069,7 @@ static int hss_hdlc_open(struct net_device *dev) hss_start_hdlc(port); /* we may already have RX data, enables IRQ */ - netif_rx_schedule(dev, &port->napi); + netif_rx_schedule(&port->napi); return 0; err_unlock: