From: Satyam Sharma <satyam@infradead.org>
To: Mel Gorman <mel@skynet.ie>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Netdev Mailing List <netdev@vger.kernel.org>,
Jeff Garzik <jeff@garzik.org>, David Miller <davem@davemloft.net>
Subject: [PATCH -mm] pasemi_mac: Build fix after recent netdev stats changes
Date: Sat, 22 Sep 2007 13:10:32 +0530 (IST) [thread overview]
Message-ID: <alpine.LFD.0.999.0709221308300.22517@enigma.security.iitk.ac.in> (raw)
In-Reply-To: <alpine.LFD.0.999.0709201903180.17093@enigma.security.iitk.ac.in>
On Thu, 20 Sep 2007, Satyam Sharma wrote:
>
> BTW ppc64_defconfig didn't quite like 2.6.23-rc6-mm1 either ...
> IIRC I got build failures in:
> drivers/net/pasemi_mac.c
[PATCH -mm] pasemi_mac: Build fix after recent netdev stats changes
Unbreak the following:
drivers/net/pasemi_mac.c: In function 'pasemi_mac_clean_rx':
drivers/net/pasemi_mac.c:533: error: 'dev' undeclared (first use in this function)
drivers/net/pasemi_mac.c:533: error: (Each undeclared identifier is reported only once
drivers/net/pasemi_mac.c:533: error: for each function it appears in.)
And remove an unused static function:
drivers/net/pasemi_mac.c: At top level:
drivers/net/pasemi_mac.c:89: warning: 'read_iob_reg' defined but not used
Signed-off-by: Satyam Sharma <satyam@infradead.org>
---
drivers/net/pasemi_mac.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff -ruNp a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c
--- a/drivers/net/pasemi_mac.c 2007-09-22 06:26:39.000000000 +0530
+++ b/drivers/net/pasemi_mac.c 2007-09-22 13:03:04.000000000 +0530
@@ -85,11 +85,6 @@ MODULE_PARM_DESC(debug, "PA Semi MAC bit
static struct pasdma_status *dma_status;
-static unsigned int read_iob_reg(struct pasemi_mac *mac, unsigned int reg)
-{
- return in_le32(mac->iob_regs+reg);
-}
-
static void write_iob_reg(struct pasemi_mac *mac, unsigned int reg,
unsigned int val)
{
@@ -530,8 +525,8 @@ static int pasemi_mac_clean_rx(struct pa
} else
skb->ip_summed = CHECKSUM_NONE;
- dev->stats.rx_bytes += len;
- dev->stats.rx_packets++;
+ mac->netdev->stats.rx_bytes += len;
+ mac->netdev->stats.rx_packets++;
skb->protocol = eth_type_trans(skb, mac->netdev);
netif_receive_skb(skb);
next prev parent reply other threads:[~2007-09-22 7:37 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20070918011841.2381bd93.akpm@linux-foundation.org>
[not found] ` <20070918162039.GA1804@skynet.ie>
2007-09-18 16:41 ` 2.6.23-rc6-mm1: Build failure on ppc64 drivers/net/ehea/ehea_main.c Mel Gorman
[not found] ` <20070919235828.GA31759@nineveh.local>
[not found] ` <20070919170934.84f44e05.akpm@linux-foundation.org>
[not found] ` <f86d6cc00709200721h6e8f7cf8xa2264e9d1f88883b@mail.gmail.com>
[not found] ` <f86d6cc00709200912j37a3218boa882a044c0610779@mail.gmail.com>
2007-09-20 19:44 ` 2.6.23-rc6-mm1 Andrew Morton
[not found] ` <20070920132512.GF24105@skynet.ie>
[not found] ` <alpine.LFD.0.999.0709201903180.17093@enigma.security.iitk.ac.in>
2007-09-22 6:54 ` 2.6.23-rc6-mm1: Build failures on ppc64_defconfig Satyam Sharma
2007-09-24 11:12 ` Mel Gorman
2007-09-22 7:25 ` Satyam Sharma
2007-09-22 7:40 ` Satyam Sharma [this message]
2007-09-22 7:54 ` [PATCH -mm] mv643xx_eth: Remove redundant multiple initialization Satyam Sharma
2007-09-22 7:55 ` [PATCH -mm] iseries_veth: Kill unused variable Satyam Sharma
[not found] ` <20070921020554.GE31759@nineveh.local>
[not found] ` <m1fy18k5ru.fsf@ebiederm.dsl.xmission.com>
[not found] ` <46F7EC0A.9030506@trash.net>
[not found] ` <20070924131458.0daa4562@freepuppy.rosehill>
2007-09-25 4:07 ` [PATCH] Remove broken netfilter binary sysctls from bridging code Patrick McHardy
2007-09-25 16:12 ` Stephen Hemminger
2007-09-25 16:22 ` Patrick McHardy
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=alpine.LFD.0.999.0709221308300.22517@enigma.security.iitk.ac.in \
--to=satyam@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=jeff@garzik.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mel@skynet.ie \
--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;
as well as URLs for NNTP newsgroup(s).