[PATCH 10/10] net: remove cli()/sti() from drivers/net/wan/sdla_x25.c

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: James Nelson <james4765@xxxxxxxxx>

diff -urN --exclude='*~' linux-2.6.10-mm2-original/drivers/net/wan/sdla_x25.c linux-2.6.10-mm2/drivers/net/wan/sdla_x25.c
--- linux-2.6.10-mm2-original/drivers/net/wan/sdla_x25.c	2005-01-08 12:16:35.000000000 -0500
+++ linux-2.6.10-mm2/drivers/net/wan/sdla_x25.c	2005-01-11 18:57:26.712535281 -0500
@@ -3535,10 +3535,9 @@
 {
 	x25_channel_t* chan = dev->priv;
 	sdla_t* card = chan->card;
-	unsigned long flags;
+	unsigned long smp_flags;
 
-	save_flags(flags);
-	cli();
+	S508_S514_lock(card, *smp_flags);
 	if (chan->common.state != state)
 	{
 		switch (state)
@@ -3602,7 +3601,7 @@
 		chan->common.state = state;
 	}
 	chan->state_tick = jiffies;
-	restore_flags(flags);
+	S508_S514_unlock(card, *smp_flags);
 }
 
 /*
-
: send the line "unsubscribe linux-net" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Netdev]     [Ethernet Bridging]     [Linux 802.1Q VLAN]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Git]     [Bugtraq]     [Yosemite News and Information]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux PCI]     [Linux Admin]     [Samba]

  Powered by Linux