diff options
-rw-r--r-- | drivers/net/macmace.c | 6 | ||||
-rw-r--r-- | drivers/net/mvme147.c | 1 |
2 files changed, 3 insertions, 4 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 | ||
541 | static void mace_handle_misc_intrs(struct mace_data *mp, int intr) | 541 | static 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 | ||
646 | static void mace_dma_rx_frame(struct net_device *dev, struct mace_frame *mf) | 647 | static 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 | ||
diff --git a/drivers/net/mvme147.c b/drivers/net/mvme147.c index 86c9c06433cb..06ca4252155f 100644 --- a/drivers/net/mvme147.c +++ b/drivers/net/mvme147.c | |||
@@ -85,7 +85,6 @@ struct net_device * __init mvme147lance_probe(int unit) | |||
85 | dev->open = &m147lance_open; | 85 | dev->open = &m147lance_open; |
86 | dev->stop = &m147lance_close; | 86 | dev->stop = &m147lance_close; |
87 | dev->hard_start_xmit = &lance_start_xmit; | 87 | dev->hard_start_xmit = &lance_start_xmit; |
88 | dev->get_stats = &lance_get_stats; | ||
89 | dev->set_multicast_list = &lance_set_multicast; | 88 | dev->set_multicast_list = &lance_set_multicast; |
90 | dev->tx_timeout = &lance_tx_timeout; | 89 | dev->tx_timeout = &lance_tx_timeout; |
91 | dev->dma = 0; | 90 | dev->dma = 0; |