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

• Lines: 33
• Date: Thu Sep 13 16:04:43 2001
• Orig file: v2.4.9/linux/drivers/net/wan/sdla_ppp.c
• Orig date: Mon Aug 27 12:41:43 2001

diff -u --recursive --new-file v2.4.9/linux/drivers/net/wan/sdla_ppp.c linux/drivers/net/wan/sdla_ppp.c
@@ -90,6 +90,7 @@
 * Jan 06, 1997	Gene Kozin	Initial version.
 *****************************************************************************/
 
+#include <linux/module.h>
 #include <linux/version.h>
 #include <linux/kernel.h>	/* printk(), and other useful stuff */
 #include <linux/stddef.h>	/* offsetof(), etc. */
@@ -400,7 +401,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(unsigned int, conf->mtu, PPP_MAX_MTU) : PPP_DFLT_MTU;
+		min_t(unsigned int, conf->mtu, PPP_MAX_MTU) : PPP_DFLT_MTU;
 
 	card->wandev.bps	= conf->bps;
 	card->wandev.interface	= conf->interface;
@@ -629,7 +630,7 @@
 	
 	dev->init = &if_init;
 	dev->priv = ppp_priv_area;
-	dev->mtu = min(unsigned int, dev->mtu, card->wandev.mtu);
+	dev->mtu = min_t(unsigned int, dev->mtu, card->wandev.mtu);
 
 	/* Initialize the polling task routine */
 #ifndef LINUX_2_4
@@ -3720,5 +3721,6 @@
 	return 0;
 }
 
+MODULE_LICENSE("GPL");
 
 /****** End *****************************************************************/