aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/macmace.c
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2007-10-13 08:31:29 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-13 12:41:03 -0400
commit3649ba001b5d037e2cead173b6cff54d32ef154a (patch)
treed4737389dc011c09c237d76f3c05adf07c58ef88 /drivers/net/macmace.c
parent0dddfd46f07db880df7d99e6ebe8baca11591f29 (diff)
m68k: fix net drivers after recent get_stats updates
m68k: fix net drivers after recent get_stats updates Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net/macmace.c')
-rw-r--r--drivers/net/macmace.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/macmace.c b/drivers/net/macmace.c
index 6589239b79ee..18770527df99 100644
--- a/drivers/net/macmace.c
+++ b/drivers/net/macmace.c
@@ -538,8 +538,9 @@ static void mace_set_multicast(struct net_device *dev)
538 local_irq_restore(flags); 538 local_irq_restore(flags);
539} 539}
540 540
541static void mace_handle_misc_intrs(struct mace_data *mp, int intr) 541static void mace_handle_misc_intrs(struct net_device *dev, int intr)
542{ 542{
543 struct mace_data *mp = netdev_priv(dev);
543 volatile struct mace *mb = mp->mace; 544 volatile struct mace *mb = mp->mace;
544 static int mace_babbles, mace_jabbers; 545 static int mace_babbles, mace_jabbers;
545 546
@@ -571,7 +572,7 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id)
571 local_irq_save(flags); 572 local_irq_save(flags);
572 573
573 intr = mb->ir; /* read interrupt register */ 574 intr = mb->ir; /* read interrupt register */
574 mace_handle_misc_intrs(mp, intr); 575 mace_handle_misc_intrs(dev, intr);
575 576
576 if (intr & XMTINT) { 577 if (intr & XMTINT) {
577 fs = mb->xmtfs; 578 fs = mb->xmtfs;
@@ -645,7 +646,6 @@ static void mace_tx_timeout(struct net_device *dev)
645 646
646static void mace_dma_rx_frame(struct net_device *dev, struct mace_frame *mf) 647static void mace_dma_rx_frame(struct net_device *dev, struct mace_frame *mf)
647{ 648{
648 struct mace_data *mp = netdev_priv(dev);
649 struct sk_buff *skb; 649 struct sk_buff *skb;
650 unsigned int frame_status = mf->rcvsts; 650 unsigned int frame_status = mf->rcvsts;
651 651