patch-2.4.9 linux/drivers/net/hamradio/baycom_epp.c

• Lines: 48
• Date: Wed Aug 15 01:22:15 2001
• Orig file: v2.4.8/linux/drivers/net/hamradio/baycom_epp.c
• Orig date: Wed Apr 18 14:40:06 2001

diff -u --recursive --new-file v2.4.8/linux/drivers/net/hamradio/baycom_epp.c linux/drivers/net/hamradio/baycom_epp.c
@@ -246,11 +246,6 @@
 
 /* --------------------------------------------------------------------- */
 
-#define min(a, b) (((a) < (b)) ? (a) : (b))
-#define max(a, b) (((a) > (b)) ? (a) : (b))
-
-/* --------------------------------------------------------------------- */
-
 #define KISS_VERBOSE
 
 /* --------------------------------------------------------------------- */
@@ -615,7 +610,7 @@
 	while (cnt > 0) {
 		switch (bc->hdlctx.state) {
 		case tx_keyup:
-			i = min(cnt, bc->hdlctx.flags);
+			i = min(int, cnt, bc->hdlctx.flags);
 			cnt -= i;
 			bc->hdlctx.flags -= i;
 			if (bc->hdlctx.flags <= 0)
@@ -638,7 +633,7 @@
 					break;
 				}
 			}
-			i = min(cnt, bc->hdlctx.bufcnt);
+			i = min(int, cnt, bc->hdlctx.bufcnt);
 			bc->hdlctx.bufcnt -= i;
 			cnt -= i;
 			if (i != pp->ops->epp_write_data(pp, bc->hdlctx.bufptr, i, 0))
@@ -652,7 +647,7 @@
 				bc->hdlctx.state = tx_data;
 				break;
 			}
-			i = min(cnt, bc->hdlctx.flags);
+			i = min(int, cnt, bc->hdlctx.flags);
 			if (i) {
 				cnt -= i;
 				bc->hdlctx.flags -= i;
@@ -669,7 +664,7 @@
 		default:  /* fall through */
 			if (bc->hdlctx.calibrate <= 0)
 				return 0;
-			i = min(cnt, bc->hdlctx.calibrate);
+			i = min(int, cnt, bc->hdlctx.calibrate);
 			cnt -= i;
 			bc->hdlctx.calibrate -= i;
 			memset(tmp, 0, sizeof(tmp));