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

• Lines: 27
• Date: Wed Aug 15 01:22:16 2001
• Orig file: v2.4.8/linux/drivers/net/wan/sdla_ppp.c
• Orig date: Sun May 20 12:11:39 2001

diff -u --recursive --new-file v2.4.8/linux/drivers/net/wan/sdla_ppp.c linux/drivers/net/wan/sdla_ppp.c
@@ -95,7 +95,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 */
@@ -400,7 +400,7 @@
 	printk(KERN_INFO "%s: running PPP firmware v%s\n",card->devname, u.str); 
 	/* Adjust configuration and set defaults */
 	card->wandev.mtu = (conf->mtu) ?
-		min(conf->mtu, PPP_MAX_MTU) : PPP_DFLT_MTU;
+		min(unsigned int, conf->mtu, PPP_MAX_MTU) : PPP_DFLT_MTU;
 
 	card->wandev.bps	= conf->bps;
 	card->wandev.interface	= conf->interface;
@@ -629,7 +629,7 @@
 	
 	dev->init = &if_init;
 	dev->priv = ppp_priv_area;
-	dev->mtu = min(dev->mtu, card->wandev.mtu);
+	dev->mtu = min(unsigned int, dev->mtu, card->wandev.mtu);
 
 	/* Initialize the polling task routine */
 #ifndef LINUX_2_4