From: Haavard Skinnemoen <hskinnemoen@atmel.com>
To: David Miller <davem@davemloft.net>
Cc: "Jeff Garzik" <jeff@garzik.org>,
netdev@vger.kernel.org,
"Andrew Morton" <akpm@linux-foundation.org>,
"Hans-Jürgen Koch" <hjk@linutronix.de>,
"Haavard Skinnemoen" <hskinnemoen@atmel.com>
Subject: [PATCH 2.6.23-rc8-mm2] Fix a compile problem in macb.c
Date: Tue, 2 Oct 2007 17:23:23 +0200 [thread overview]
Message-ID: <1191338603393-git-send-email-hskinnemoen@atmel.com> (raw)
From: Hans-Jürgen Koch <hjk@linutronix.de>
Compiling macb.c fails because the type of parameter 2 of macb_poll()
was changed from int* to int. Furthermore, a local variable was removed
but was still used inside the function. This patch fixes it.
Signed-off-by: Hans J. Koch <hjk@linutronix.de>
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
---
drivers/net/macb.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index c28a0a4..047ea7b 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -492,7 +492,7 @@ static int macb_poll(struct napi_struct *napi, int budget)
}
dev_dbg(&bp->pdev->dev, "poll: status = %08lx, budget = %d\n",
- (unsigned long)status, *budget);
+ (unsigned long)status, budget);
if (!(status & MACB_BIT(REC))) {
dev_warn(&bp->pdev->dev,
@@ -503,7 +503,7 @@ static int macb_poll(struct napi_struct *napi, int budget)
}
work_done = macb_rx(bp, budget);
- if (work_done < orig_budget)
+ if (work_done < budget)
netif_rx_complete(dev, napi);
/*
--
1.5.3.1
next reply other threads:[~2007-10-02 15:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-02 15:23 Haavard Skinnemoen [this message]
2007-10-02 17:31 ` [PATCH 2.6.23-rc8-mm2] Fix a compile problem in macb.c Jeff Garzik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1191338603393-git-send-email-hskinnemoen@atmel.com \
--to=hskinnemoen@atmel.com \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=hjk@linutronix.de \
--cc=jeff@garzik.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox