redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

axnet_cs: use spin_lock_irqsave instead of spin_lock + disable_irq

Browse source 
Signed-off-by: Komuro <komurojun-mbn@nifty.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Komuro 2007-11-11 11:04:36 +09:00 committed by David S. Miller
parent 2eab17ab88
commit bd5a934620
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/net/pcmcia/axnet_cs.c
View file

@ -1040,15 +1040,13 @@ void ei_tx_timeout(struct net_device *dev)
/* Ugly but a reset can be slow, yet must be protected */ /* Ugly but a reset can be slow, yet must be protected */
disable_irq_nosync(dev->irq); spin_lock_irqsave(&ei_local->page_lock, flags);
spin_lock(&ei_local->page_lock);
/* Try to restart the card. Perhaps the user has fixed something. */ /* Try to restart the card. Perhaps the user has fixed something. */
ei_reset_8390(dev); ei_reset_8390(dev);
AX88190_init(dev, 1); AX88190_init(dev, 1);
spin_unlock(&ei_local->page_lock); spin_unlock_irqrestore(&ei_local->page_lock, flags);
enable_irq(dev->irq);
netif_wake_queue(dev); netif_wake_queue(dev);
} }
@ -1085,9 +1083,7 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
* Slow phase with lock held. * Slow phase with lock held.
*/ */
disable_irq_nosync(dev->irq); spin_lock_irqsave(&ei_local->page_lock, flags);
spin_lock(&ei_local->page_lock);
ei_local->irqlock = 1; ei_local->irqlock = 1;
@ -1125,8 +1121,7 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
ei_local->irqlock = 0; ei_local->irqlock = 0;
netif_stop_queue(dev); netif_stop_queue(dev);
outb_p(ENISR_ALL, e8390_base + EN0_IMR); outb_p(ENISR_ALL, e8390_base + EN0_IMR);
spin_unlock(&ei_local->page_lock); spin_unlock_irqrestore(&ei_local->page_lock, flags);
enable_irq(dev->irq);
ei_local->stat.tx_errors++; ei_local->stat.tx_errors++;
return 1; return 1;
} }
@ -1172,8 +1167,7 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
ei_local->irqlock = 0; ei_local->irqlock = 0;
outb_p(ENISR_ALL, e8390_base + EN0_IMR); outb_p(ENISR_ALL, e8390_base + EN0_IMR);
spin_unlock(&ei_local->page_lock); spin_unlock_irqrestore(&ei_local->page_lock, flags);
enable_irq(dev->irq);
dev_kfree_skb (skb); dev_kfree_skb (skb);
ei_local->stat.tx_bytes += send_length; ei_local->stat.tx_bytes += send_length;