Hi Krzysztof,
Today's linux-next build (x86_64 allmodconfig) failed like this:
drivers/net/wan/hdlc_ppp.c: In function 'ppp_cp_parse_cr':
drivers/net/wan/hdlc_ppp.c:384: error: 'struct hdlc_device' has no member named 'stats'
drivers/net/wan/hdlc_ppp.c:390: error: 'struct hdlc_device' has no member named 'stats'
drivers/net/wan/hdlc_ppp.c: In function 'ppp_rx':
drivers/net/wan/hdlc_ppp.c:552: error: 'struct hdlc_device' has no member named 'stats'
Caused by commit 198191c4a7ce4daba379608fb38b9bc5a4eedc61 ("WAN: convert
drivers to use built-in netdev_stats") from Linus' tree interacting with
commit 2c7275708f373ac387352f13e509fd0c7679e12c ("WAN: new synchronous
PPP implementation for generic HDLC").
I have to wonder if this was even build tested ...
I added the following patch.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Thu, 14 Aug 2008 15:34:53 +1000
Subject: [PATCH] hdlc_ppp: fix up for move of stats pointer
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
drivers/net/wan/hdlc_ppp.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c
index b0a63be..72fae21 100644
--- a/drivers/net/wan/hdlc_ppp.c
+++ b/drivers/net/wan/hdlc_ppp.c
@@ -381,13 +381,13 @@ static void ppp_cp_parse_cr(struct net_device *dev, u16 pid, u8 id,
unsigned int nak_len = 0, rej_len = 0;
if (!(out = kmalloc(len, GFP_ATOMIC))) {
- dev_to_hdlc(dev)->stats.rx_dropped++;
+ dev->stats.rx_dropped++;
return; /* out of memory, ignore CR packet */
}
for (opt = data; len; len -= opt[1], opt += opt[1]) {
if (len < 2 || len < opt[1]) {
- dev_to_hdlc(dev)->stats.rx_errors++;
+ dev->stats.rx_errors++;
return; /* bad packet, drop silently */
}
@@ -549,7 +549,7 @@ static int ppp_rx(struct sk_buff *skb)
goto out;
rx_error:
- dev_to_hdlc(dev)->stats.rx_errors++;
+ dev->stats.rx_errors++;
out:
spin_unlock_irqrestore(&ppp->lock, flags);
dev_kfree_skb_any(skb);
--
1.5.6.3
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
