patch-2.4.10 linux/drivers/net/hamradio/baycom_epp.c
Next file: linux/drivers/net/hamradio/bpqether.c
Previous file: linux/drivers/net/hamradio/6pack.c
Back to the patch index
Back to the overall index
- Lines: 36
- Date:
Mon Sep 10 09:04:53 2001
- Orig file:
v2.4.9/linux/drivers/net/hamradio/baycom_epp.c
- Orig date:
Mon Aug 27 12:41:42 2001
diff -u --recursive --new-file v2.4.9/linux/drivers/net/hamradio/baycom_epp.c linux/drivers/net/hamradio/baycom_epp.c
@@ -610,7 +610,7 @@
while (cnt > 0) {
switch (bc->hdlctx.state) {
case tx_keyup:
- i = min(int, cnt, bc->hdlctx.flags);
+ i = min_t(int, cnt, bc->hdlctx.flags);
cnt -= i;
bc->hdlctx.flags -= i;
if (bc->hdlctx.flags <= 0)
@@ -633,7 +633,7 @@
break;
}
}
- i = min(int, cnt, bc->hdlctx.bufcnt);
+ i = min_t(int, cnt, bc->hdlctx.bufcnt);
bc->hdlctx.bufcnt -= i;
cnt -= i;
if (i != pp->ops->epp_write_data(pp, bc->hdlctx.bufptr, i, 0))
@@ -647,7 +647,7 @@
bc->hdlctx.state = tx_data;
break;
}
- i = min(int, cnt, bc->hdlctx.flags);
+ i = min_t(int, cnt, bc->hdlctx.flags);
if (i) {
cnt -= i;
bc->hdlctx.flags -= i;
@@ -664,7 +664,7 @@
default: /* fall through */
if (bc->hdlctx.calibrate <= 0)
return 0;
- i = min(int, cnt, bc->hdlctx.calibrate);
+ i = min_t(int, cnt, bc->hdlctx.calibrate);
cnt -= i;
bc->hdlctx.calibrate -= i;
memset(tmp, 0, sizeof(tmp));
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)