From: Ingo Molnar <mingo@elte.hu>
To: David Miller <davem@davemloft.net>
Cc: parag.lkml@gmail.com, shemminger@vyatta.com,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Fix net/irda build breakage
Date: Sat, 10 Jan 2009 12:01:57 +0100 [thread overview]
Message-ID: <20090110110157.GA13322@elte.hu> (raw)
In-Reply-To: <20090110105827.GA9460@elte.hu>
* Ingo Molnar <mingo@elte.hu> wrote:
> > Already fixed in the net-2.6 GIT tree, but thanks.
>
> mind sending the patch here to lkml too so that people can pick it up?
> Current -git is broken with x86 allyesconfig and Parag's patch above is
> whitespace damaged.
below is the undamaged one - in case someone here on lkml needs the fix.
Ingo
-------------->
>From a5532d29c1ade8b4576f449d4e40678490b96594 Mon Sep 17 00:00:00 2001
From: Parag Warudkar <parag.lkml@gmail.com>
Date: Fri, 9 Jan 2009 18:30:58 -0500
Subject: [PATCH] Fix net/irda build breakage
commit af0490810cfa159b4894ddecfc5eb2e4432fb976 breaks build for net/irda -
drivers/net/irda/donauboe.c: In function 'toshoboe_interrupt':
drivers/net/irda/donauboe.c:1197: error: 'struct toshoboe_cb' has no member named 'stats'
drivers/net/irda/donauboe.c:1201: error: 'struct toshoboe_cb' has no member named 'stats'
drivers/net/irda/donauboe.c:1283: error: 'struct toshoboe_cb' has no member named 'stats'
make[3]: *** [drivers/net/irda/donauboe.o] Error 1
make[2]: *** [drivers/net/irda] Error 2
Fix this.
Signed-off-by: Parag Warudkar <parag.lkml@gmail.com>
Cc: davem@davemloft.net
Cc: shemminger@vyatta.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
drivers/net/irda/donauboe.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c
index 687c2d5..6f3e7f7 100644
--- a/drivers/net/irda/donauboe.c
+++ b/drivers/net/irda/donauboe.c
@@ -1194,13 +1194,13 @@ toshoboe_interrupt (int irq, void *dev_id)
txp = txpc;
txpc++;
txpc %= TX_SLOTS;
- self->stats.tx_packets++;
+ self->netdev->stats.tx_packets++;
if (self->ring->tx[txpc].control & OBOE_CTL_TX_HW_OWNS)
self->ring->tx[txp].control &= ~OBOE_CTL_TX_RTCENTX;
}
- self->stats.tx_packets--;
+ self->netdev->stats.tx_packets--;
#else
- self->stats.tx_packets++;
+ self->netdev->stats.tx_packets++;
#endif
toshoboe_start_DMA(self, OBOE_CONFIG0H_ENTX);
}
@@ -1280,7 +1280,7 @@ dumpbufs(self->rx_bufs[self->rxs],len,'<');
skb_put (skb, len);
skb_copy_to_linear_data(skb, self->rx_bufs[self->rxs],
len);
- self->stats.rx_packets++;
+ self->netdev->stats.rx_packets++;
skb->dev = self->netdev;
skb_reset_mac_header(skb);
skb->protocol = htons (ETH_P_IRDA);
next prev parent reply other threads:[~2009-01-10 11:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-09 23:30 Parag Warudkar
2009-01-10 1:02 ` David Miller
2009-01-10 10:58 ` Ingo Molnar
2009-01-10 11:01 ` Ingo Molnar [this message]
2009-01-11 7:32 ` David Miller
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=20090110110157.GA13322@elte.hu \
--to=mingo@elte.hu \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=parag.lkml@gmail.com \
--cc=shemminger@vyatta.com \
/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
all inboxes | Powered by JetHome®