Use the new spin_trylock_irqsave() macro to make it easier for
the -rt development.
Signed-off-by: Stephen Hemminger <[EMAIL PROTECTED]>
--- skge.orig/drivers/net/skge.c 2006-02-20 10:45:15.000000000 -0800
+++ skge/drivers/net/skge.c 2006-02-20 10:47:24.000000000 -0800
@@ -2294,12 +2294,9 @@
if (!skb)
return NETDEV_TX_OK;
- local_irq_save(flags);
- if (!spin_trylock(&skge->tx_lock)) {
- /* Collision - tell upper layer to requeue */
- local_irq_restore(flags);
+ /* Collision - tell upper layer to requeue */
+ if (!spin_trylock_irqsave(&skge->tx_lock, flags))
return NETDEV_TX_LOCKED;
- }
if (unlikely(skge->tx_avail < skb_shinfo(skb)->nr_frags +1)) {
if (!netif_queue_stopped(dev)) {
--
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
