Skip to content

Commit

Permalink
[netdrvr] convert sbmac tx to spin_lock_irqsave to prevent early IRQ …
Browse files Browse the repository at this point in the history
…enable

Netpoll will call the interrupt handler with interrupts
disabled when using kgdboe, so spin_lock_irqsave() should
be used instead of spin_lock_irq() to prevent interrupts
from being incorrectly enabled.

Signed-off-by: Weiwei Wang <weiwei.wang@windriver.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  • Loading branch information
Weiwei Wang authored and Jeff Garzik committed Sep 25, 2008
1 parent 3157814 commit be61ea5
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions drivers/net/sb1250-mac.c
Original file line number Diff line number Diff line change
Expand Up @@ -2069,9 +2069,10 @@ static irqreturn_t sbmac_intr(int irq,void *dev_instance)
static int sbmac_start_tx(struct sk_buff *skb, struct net_device *dev)
{
struct sbmac_softc *sc = netdev_priv(dev);
unsigned long flags;

/* lock eth irq */
spin_lock_irq (&sc->sbm_lock);
spin_lock_irqsave(&sc->sbm_lock, flags);

/*
* Put the buffer on the transmit ring. If we
Expand All @@ -2081,14 +2082,14 @@ static int sbmac_start_tx(struct sk_buff *skb, struct net_device *dev)
if (sbdma_add_txbuffer(&(sc->sbm_txdma),skb)) {
/* XXX save skb that we could not send */
netif_stop_queue(dev);
spin_unlock_irq(&sc->sbm_lock);
spin_unlock_irqrestore(&sc->sbm_lock, flags);

return 1;
}

dev->trans_start = jiffies;

spin_unlock_irq (&sc->sbm_lock);
spin_unlock_irqrestore(&sc->sbm_lock, flags);

return 0;
}
Expand Down Expand Up @@ -2568,14 +2569,15 @@ static void sbmac_mii_poll(struct net_device *dev)
static void sbmac_tx_timeout (struct net_device *dev)
{
struct sbmac_softc *sc = netdev_priv(dev);
unsigned long flags;

spin_lock_irq (&sc->sbm_lock);
spin_lock_irqsave(&sc->sbm_lock, flags);


dev->trans_start = jiffies;
dev->stats.tx_errors++;

spin_unlock_irq (&sc->sbm_lock);
spin_unlock_irqrestore(&sc->sbm_lock, flags);

printk (KERN_WARNING "%s: Transmit timed out\n",dev->name);
}
Expand Down

0 comments on commit be61ea5

Please sign in to comment.