From 8624512aa908741ba2795200133eae0d7f4557ea Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 2 Mar 2000 02:36:47 +0000 Subject: Merge with 2.3.48. --- drivers/net/tokenring/olympic.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'drivers/net/tokenring/olympic.c') diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c index 5f80fc5eb..d4b2e0380 100644 --- a/drivers/net/tokenring/olympic.c +++ b/drivers/net/tokenring/olympic.c @@ -26,10 +26,9 @@ * resource. Driver also reports the card name returned by * the pci resource. * 1/11/00 - Added spinlocks for smp - * - * To Do: + * 2/23/00 - Updated to dev_kfree_irq * - * IPv6 Multicast + * To Do: * * If Problems do Occur * Most problems can be rectified by either closing and opening the interface @@ -88,7 +87,7 @@ */ static char *version = -"Olympic.c v0.3.1 1/11/00 - Peter De Schrijver & Mike Phillips" ; +"Olympic.c v0.3.2 2/23/00 - Peter De Schrijver & Mike Phillips" ; static char *open_maj_error[] = {"No error", "Lobe Media Test", "Physical Insertion", "Address Verification", "Neighbor Notification (Ring Poll)", @@ -777,7 +776,7 @@ static void olympic_interrupt(int irq, void *dev_id, struct pt_regs *regs) olympic_priv->free_tx_ring_entries++; olympic_priv->olympic_stats.tx_bytes += olympic_priv->tx_ring_skb[olympic_priv->tx_ring_last_status]->len; olympic_priv->olympic_stats.tx_packets++ ; - dev_kfree_skb(olympic_priv->tx_ring_skb[olympic_priv->tx_ring_last_status]); + dev_kfree_skb_irq(olympic_priv->tx_ring_skb[olympic_priv->tx_ring_last_status]); olympic_priv->olympic_tx_ring[olympic_priv->tx_ring_last_status].buffer=0xdeadbeef; olympic_priv->olympic_tx_status_ring[olympic_priv->tx_ring_last_status].status=0; netif_wake_queue(dev); -- cgit v1.2.3