patch-2.4.10 linux/drivers/net/wan/comx.c
Next file: linux/drivers/net/wan/cosa.c
Previous file: linux/drivers/net/wan/comx-proto-ppp.c
Back to the patch index
Back to the overall index
- Lines: 37
- Date:
Thu Sep 13 16:04:43 2001
- Orig file:
v2.4.9/linux/drivers/net/wan/comx.c
- Orig date:
Mon Aug 27 12:41:43 2001
diff -u --recursive --new-file v2.4.9/linux/drivers/net/wan/comx.c linux/drivers/net/wan/comx.c
@@ -78,6 +78,7 @@
MODULE_AUTHOR("Gergely Madarasz <gorgo@itc.hu>");
MODULE_DESCRIPTION("Common code for the COMX synchronous serial adapters");
+MODULE_LICENSE("GPL");
extern int comx_hw_comx_init(void);
extern int comx_hw_locomx_init(void);
@@ -151,8 +152,8 @@
int free = (ch->debug_start - ch->debug_end + ch->debug_size)
% ch->debug_size;
- to_copy = min(int, free ? free : ch->debug_size,
- min(int, ch->debug_size - ch->debug_end, len));
+ to_copy = min_t(int, free ? free : ch->debug_size,
+ min_t(int, ch->debug_size - ch->debug_end, len));
memcpy(ch->debug_area + ch->debug_end, str, to_copy);
str += to_copy;
len -= to_copy;
@@ -567,7 +568,7 @@
if (count >= len - off) {
*eof = 1;
}
- return min(int, count, len - off);
+ return min_t(int, count, len - off);
}
@@ -597,7 +598,7 @@
if (count >= len - off) {
*eof = 1;
}
- return min(int, count, len - off);
+ return min_t(int, count, len - off);
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)