Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3649ba00 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds
Browse files

m68k: fix net drivers after recent get_stats updates 



m68k: fix net drivers after recent get_stats updates

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0dddfd46

drivers/net/macmace.c

+3 −3
Original line number Diff line number Diff line
@@ -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;
@@ -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;
@@ -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;

drivers/net/mvme147.c

+0 −1
Original line number Diff line number Diff line
@@ -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;