8139too.c

"Employ your time in improving yourself by other men's writings, so that you 
shall gain easily what others have labored hard for."
Socrates
diff -urN /usr/src/linux-2.6.15-rc7/drivers/net/8139too.c /home/cneira/Linuxjanitoring/linux-janitorpatching/drivers/net/8139too.c
@@ -111,6 +111,7 @@
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/irq.h>
+#include<linux/wait.h>
 
 #define RTL8139_DRIVER_NAME   DRV_NAME " Fast Ethernet driver " DRV_VERSION
 #define PFX DRV_NAME ": "

@@ -1599,18 +1600,21 @@
 	struct net_device *dev = data;
 	struct rtl8139_private *tp = netdev_priv(dev);
 	unsigned long timeout;
-
+	wait_queue_head_t  rlq;
+	init_waitqueue_head(&rlq);
+	int gotsignal ;
 	daemonize("%s", dev->name);
 	allow_signal(SIGTERM);
 
 	while (1) {
 		timeout = next_tick;
 		do {
-			timeout = interruptible_sleep_on_timeout (&tp->thr_wait, timeout);
-			/* make swsusp happy with our thread */
-			try_to_freeze();
-		} while (!signal_pending (current) && (timeout > 0));
+		  
+		 gotsignal = wait_event_interruptible(rlq,timeout > 0);	
+		  
+		} while (gotsignal != 0  && (timeout > 0));
 
+		
 		if (signal_pending (current)) {
 			flush_signals(current);
 		}

 	while (1) {
 		timeout = next_tick;
 		do {
-			timeout = interruptible_sleep_on_timeout (&tp->thr_wait, timeout);
-			/* make swsusp happy with our thread */
-			try_to_freeze();
-		} while (!signal_pending (current) && (timeout > 0));
+		  
+		 gotsignal = wait_event_interruptible(rlq,timeout > 0);	
+		  
+		} while (gotsignal != 0  && (timeout > 0));
 
+		

 	while (1) {
 		timeout = next_tick;
 		do {
-			timeout = interruptible_sleep_on_timeout (&tp->thr_wait, timeout);
-			/* make swsusp happy with our thread */
-			try_to_freeze();
-		} while (!signal_pending (current) && (timeout > 0));
+		  
+		 gotsignal = wait_event_interruptible(rlq,timeout > 0);	
+		  
+		} while (gotsignal != 0  && (timeout > 0));

+		


8139too.c

carlos neira

Alexey Dobriyan

Nishanth Aravamudan