Skip to content

Commit

Permalink
m68k: fix net drivers after recent get_stats updates
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Geert Uytterhoeven authored and Linus Torvalds committed Oct 13, 2007
1 parent 0dddfd4 commit 3649ba0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
6 changes: 3 additions & 3 deletions drivers/net/macmace.c
Original file line number Diff line number Diff line change
Expand Up @@ -538,8 +538,9 @@ static void mace_set_multicast(struct net_device *dev)
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;

Expand Down Expand Up @@ -571,7 +572,7 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id)
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;
Expand Down Expand Up @@ -645,7 +646,6 @@ static void mace_tx_timeout(struct net_device *dev)

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;

Expand Down
1 change: 0 additions & 1 deletion drivers/net/mvme147.c
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ struct net_device * __init mvme147lance_probe(int unit)
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;
Expand Down

0 comments on commit 3649ba0

Please sign in to comment.