patch-2.4.10 linux/drivers/net/wan/comx-proto-fr.c

Next file: linux/drivers/net/wan/comx-proto-lapb.c
Previous file: linux/drivers/net/wan/comx-hw-mixcom.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.9/linux/drivers/net/wan/comx-proto-fr.c linux/drivers/net/wan/comx-proto-fr.c
@@ -53,7 +53,8 @@
 
 MODULE_AUTHOR("Author: Tivadar Szemethy <tiv@itc.hu>");
 MODULE_DESCRIPTION("Frame Relay protocol implementation for the COMX drivers"
-	"for Linux kernel 2.2.X");
+	"for Linux kernel 2.4.X");
+MODULE_LICENSE("GPL");
 
 #define	FRAD_UI		0x03
 #define	NLPID_IP	0xcc
@@ -634,7 +635,7 @@
 
 	*start = page + off;
 	if (count >= len - off) *eof = 1;
-	return min(int, count, len - off);
+	return min_t(int, count, len - off);
 }
 
 static int fr_write_proc(struct file *file, const char *buffer, 

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