From patchwork Mon Dec 29 11:57:06 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Dobriyan X-Patchwork-Id: 15912 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 C7F10DDDF6 for ; Mon, 29 Dec 2008 22:52:10 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753306AbYL2LwG (ORCPT ); Mon, 29 Dec 2008 06:52:06 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753318AbYL2LwF (ORCPT ); Mon, 29 Dec 2008 06:52:05 -0500 Received: from mail-ew0-f17.google.com ([209.85.219.17]:45438 "EHLO mail-ew0-f17.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753042AbYL2LwE (ORCPT ); Mon, 29 Dec 2008 06:52:04 -0500 Received: by ewy10 with SMTP id 10so4980465ewy.13 for ; Mon, 29 Dec 2008 03:52:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=6qdjRH1F2o/D2/TK2FonnKuyR8wZOgEaIg9ruu1IYx0=; b=SfYw60Eeo+/shzsLjKH7Ve30xhGfJpjRajBfL1Iy+6Iohd9hyq5LnBM69zUCfHMB0l k995EAWVPkLbi18g4cqPqEw21kXr2EWg7pKp7IXU7rH1z5jKWTjdkNIXAnaNH1hRAkqi 0AEcQj1lQZFfhkf1SHJRwSQ8rUXvmLYiM+R1Y= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=oBE5QcIFRlpvooPxggrlFsxUDYVNlPJqttTxtu4yZOAf5wPnV10vSr7B8PrVLtweCF 8DmjhJk37vkxpbxD7PW9P1ungF8mgIOrfd61ryYSoY4pVh9xQHvGC43r14Et7uaagOYM 6bJw+Dd1YxldjgUxbdgphq/LT+zKJLDbhlpYE= Received: by 10.210.42.13 with SMTP id p13mr2934505ebp.163.1230551520837; Mon, 29 Dec 2008 03:52:00 -0800 (PST) Received: from localhost (gw.zunet.ru [217.67.117.64]) by mx.google.com with ESMTPS id 6sm49057194nfv.15.2008.12.29.03.51.59 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 29 Dec 2008 03:52:00 -0800 (PST) Date: Mon, 29 Dec 2008 14:57:06 +0300 From: Alexey Dobriyan To: davem@davemloft.net Cc: netdev@vger.kernel.org Subject: [PATCH] smsc911x: compile fix re netif_rx signature changes Message-ID: <20081229115706.GA21117@x200.localdomain> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Alexey Dobriyan Signed-off-by: Steve Glendinning --- 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 --- 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");