summaryrefslogtreecommitdiffstats
path: root/drivers/net/ariadne.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ariadne.c')
-rw-r--r--drivers/net/ariadne.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c
index 290b9761e..884398c53 100644
--- a/drivers/net/ariadne.c
+++ b/drivers/net/ariadne.c
@@ -593,12 +593,12 @@ static int ariadne_start_xmit(struct sk_buff *skb, struct device *dev)
/* Block a timer-based transmit from overlapping. This could better be
done with atomic_swap(1, dev->tbusy), but set_bit() works as well. */
- if (set_bit(0, (void*)&dev->tbusy) != 0) {
+ if (test_and_set_bit(0, (void*)&dev->tbusy) != 0) {
printk("%s: Transmitter access conflict.\n", dev->name);
return(1);
}
- if (set_bit(0, (void*)&priv->lock) != 0) {
+ if (test_and_set_bit(0, (void*)&priv->lock) != 0) {
if (ariadne_debug > 0)
printk("%s: tx queue lock!.\n", dev->name);
/* don't clear dev->tbusy flag. */