| Message ID | 1247520220-31960-2-git-send-email-jirislaby@gmail.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
Please DO NOT combine cleanups with real bug fixes into a patch series. Bug fixes go to one tree, the rest go to another tree, and that is especially the case this late in the RC series. A series of patches are a group of changes that are supposed to be related and are expected to be applied all to the same tree. That is not true of the patches you have posted here. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Jiri Slaby <jirislaby@gmail.com> Date: Mon, 13 Jul 2009 23:23:40 +0200 > - if (!spin_trylock(&gp->tx_lock)) { > + if (!spin_trylock_irqsave(&gp->tx_lock)) { I'm about to give you a royal flaming. Any idea why? (hint: type 'make' before you send patches!!!!) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 07/14/2009 11:10 PM, David Miller wrote: >> - if (!spin_trylock(&gp->tx_lock)) { >> + if (!spin_trylock_irqsave(&gp->tx_lock)) { > > (hint: type 'make' before you send patches!!!!) Grr, I did but my bash_history shows that I built wrong subtree. My apologies. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index d2dfe0a..22474a8 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c @@ -1032,10 +1032,8 @@ static int gem_start_xmit(struct sk_buff *skb, struct net_device *dev) (csum_stuff_off << 21)); } - local_irq_save(flags); - if (!spin_trylock(&gp->tx_lock)) { + if (!spin_trylock_irqsave(&gp->tx_lock)) { /* Tell upper layer to requeue */ - local_irq_restore(flags); return NETDEV_TX_LOCKED; } /* We raced with gem_do_stop() */
Use spin_trylock_irqsave instead of open-coded local_irq_save+spin_trylock. Impact: cleanup Signed-off-by: Jiri Slaby <jirislaby@gmail.com> --- drivers/net/sungem.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)