[UPDATE PATCH] net/s2io: replace schedule_timeout() with msleep()

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

 



On Tue, Feb 15, 2005 at 04:18:42PM -0800, Ravinandan Arakali wrote:
> Jeff,
> I have just now sent you the below mentioned patch(It has the
> subject Multicast fix). Although the problem initially manifested
> as "IPv6 ping not working", root cause boiled down to driver 
> incorrectly programming multicast addresses into the NIC's Rx filter.
> 
> BTW, the patch has been generated on top of Nishanth's patch.

Here is a fix patch, which prevents an unstoppable sleep from occurring.
Now, the task can be woken by signals (Ctrl-C), etc. Generated in
response to comments by Domen Puncer & Ravindan Arakali.

Thanks,
Nish

Description: Fix a bug in the patched s2io driver, which lead to an
uninterruptible sleep lasting a *long* time. Instead, use
msleep_interruptible() to allow wake-ups early via Ctrl-C and other
signals.

Signed-off-by: Nishanth Aravamudan <nacc@xxxxxxxxxx>

--- 2.6.11-rc4-kj-v/drivers/net/s2io.c	2005-02-16 16:33:45.000000000 -0800
+++ 2.6.11-rc4-kj/drivers/net/s2io.c	2005-02-16 16:31:16.000000000 -0800
@@ -3297,9 +3297,9 @@ static int s2io_ethtool_idnic(struct net
 	}
 	mod_timer(&sp->id_timer, jiffies);
 	if (data)
-		msleep(data * 1000);
+		msleep_interruptible(data * 1000);
 	else
-		msleep(0xFFFFFFFF);
+		msleep_interruptible(0xFFFFFFFF);
 	del_timer_sync(&sp->id_timer);
 
 	if (CARDS_WITH_FAULTY_LINK_INDICATORS(subid)) {
-
: 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