patch-2.4.2 linux/drivers/net/wan/sdla_fr.c

• Lines: 18
• Date: Tue Feb 13 13:15:05 2001
• Orig file: v2.4.1/linux/drivers/net/wan/sdla_fr.c
• Orig date: Tue Jul 11 11:12:24 2000

diff -u --recursive --new-file v2.4.1/linux/drivers/net/wan/sdla_fr.c linux/drivers/net/wan/sdla_fr.c
@@ -114,7 +114,7 @@
 #include <linux/stddef.h>	/* offsetof(), etc. */
 #include <linux/errno.h>	/* return codes */
 #include <linux/string.h>	/* inline memset(), etc. */
-#include <linux/malloc.h>	/* kmalloc(), kfree() */
+#include <linux/slab.h>	/* kmalloc(), kfree() */
 #include <linux/wanrouter.h>	/* WAN router definitions */
 #include <linux/wanpipe.h>	/* WANPIPE common user API definitions */
 #include <linux/if_arp.h>	/* ARPHRD_* defines */
@@ -1133,7 +1133,7 @@
 
 	printk (KERN_INFO "%s: Transmit timed out\n", chan->name);
 	chan->drvstats_if_send.if_send_tbusy_timeout++;
-	netif_start_queue (dev);
+	netif_wake_queue (dev);
 
 }