* [patch 6/8] m68k: fix net drivers after recent get_stats updates
[not found] <20071013123123.085686856@mail.of.borg>
@ 2007-10-13 12:31 ` Geert Uytterhoeven
2007-10-13 12:44 ` Jeff Garzik
2007-10-13 12:31 ` [patch 8/8] ssb bus needs <linux/io.h> Geert Uytterhoeven
1 sibling, 1 reply; 4+ messages in thread
From: Geert Uytterhoeven @ 2007-10-13 12:31 UTC (permalink / raw)
To: Linus Torvalds, Andrew Morton
Cc: linux-m68k, linux-kernel, Jeff Garzik, netdev
[-- Attachment #1: m68k-net-fixes.diff --]
[-- Type: text/plain, Size: 1830 bytes --]
m68k: fix net drivers after recent get_stats updates
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
drivers/net/macmace.c | 6 +++---
drivers/net/mvme147.c | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
--- a/drivers/net/macmace.c
+++ b/drivers/net/macmace.c
@@ -538,8 +538,9 @@ static void mace_set_multicast(struct ne
local_irq_restore(flags);
}
-static void mace_handle_misc_intrs(struct mace_data *mp, int intr)
+static void mace_handle_misc_intrs(struct net_device *dev, int intr)
{
+ struct mace_data *mp = netdev_priv(dev);
volatile struct mace *mb = mp->mace;
static int mace_babbles, mace_jabbers;
@@ -571,7 +572,7 @@ static irqreturn_t mace_interrupt(int ir
local_irq_save(flags);
intr = mb->ir; /* read interrupt register */
- mace_handle_misc_intrs(mp, intr);
+ mace_handle_misc_intrs(dev, intr);
if (intr & XMTINT) {
fs = mb->xmtfs;
@@ -645,7 +646,6 @@ static void mace_tx_timeout(struct net_d
static void mace_dma_rx_frame(struct net_device *dev, struct mace_frame *mf)
{
- struct mace_data *mp = netdev_priv(dev);
struct sk_buff *skb;
unsigned int frame_status = mf->rcvsts;
--- a/drivers/net/mvme147.c
+++ b/drivers/net/mvme147.c
@@ -85,7 +85,6 @@ struct net_device * __init mvme147lance_
dev->open = &m147lance_open;
dev->stop = &m147lance_close;
dev->hard_start_xmit = &lance_start_xmit;
- dev->get_stats = &lance_get_stats;
dev->set_multicast_list = &lance_set_multicast;
dev->tx_timeout = &lance_tx_timeout;
dev->dma = 0;
--
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 4+ messages in thread* [patch 8/8] ssb bus needs <linux/io.h>
[not found] <20071013123123.085686856@mail.of.borg>
2007-10-13 12:31 ` [patch 6/8] m68k: fix net drivers after recent get_stats updates Geert Uytterhoeven
@ 2007-10-13 12:31 ` Geert Uytterhoeven
2007-10-13 15:23 ` Michael Buesch
1 sibling, 1 reply; 4+ messages in thread
From: Geert Uytterhoeven @ 2007-10-13 12:31 UTC (permalink / raw)
To: Linus Torvalds, Andrew Morton, Michael Buesch
Cc: linux-m68k, linux-kernel, netdev
[-- Attachment #1: ssb-needs-linux-io.h.diff --]
[-- Type: text/plain, Size: 1239 bytes --]
ssb bus needs <linux/io.h>
linux/drivers/ssb/main.c: In function 'ssb_ssb_read16':
linux/drivers/ssb/main.c:518: error: implicit declaration of function 'readw'
linux/drivers/ssb/main.c: In function 'ssb_ssb_read32':
linux/drivers/ssb/main.c:526: error: implicit declaration of function 'readl'
linux/drivers/ssb/main.c: In function 'ssb_ssb_write16':
linux/drivers/ssb/main.c:534: error: implicit declaration of function 'writew'
linux/drivers/ssb/main.c: In function 'ssb_ssb_write32':
linux/drivers/ssb/main.c:542: error: implicit declaration of function 'writel'
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
drivers/ssb/main.c | 1 +
1 file changed, 1 insertion(+)
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -11,6 +11,7 @@
#include "ssb_private.h"
#include <linux/delay.h>
+#include <linux/io.h>
#include <linux/ssb/ssb.h>
#include <linux/ssb/ssb_regs.h>
#include <linux/dma-mapping.h>
--
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 4+ messages in thread