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

Next file: linux/drivers/net/wan/sdla_x25.c
Previous file: linux/drivers/net/wan/sdla_fr.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.1/linux/drivers/net/wan/sdla_ppp.c linux/drivers/net/wan/sdla_ppp.c
@@ -80,7 +80,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 */
@@ -819,7 +819,7 @@
 	++card->wandev.stats.collisions;
 
 	/* unbusy the card (because only one interface per card) */
-	netif_start_queue(dev);
+	netif_wake_queue(dev);
 }
 
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)