patch-2.4.10 linux/fs/ncpfs/ncplib_kernel.c
Next file: linux/fs/ncpfs/ncpsign_kernel.c
Previous file: linux/fs/ncpfs/mmap.c
Back to the patch index
Back to the overall index
- Lines: 18
- Date:
Mon Sep 10 09:04:53 2001
- Orig file:
v2.4.9/linux/fs/ncpfs/ncplib_kernel.c
- Orig date:
Mon Aug 27 12:41:46 2001
diff -u --recursive --new-file v2.4.9/linux/fs/ncpfs/ncplib_kernel.c linux/fs/ncpfs/ncplib_kernel.c
@@ -127,7 +127,7 @@
ncp_unlock_server(server);
return result;
}
- *target = min(unsigned int, ntohs(ncp_reply_word(server, 0)), size);
+ *target = min_t(unsigned int, ntohs(ncp_reply_word(server, 0)), size);
ncp_unlock_server(server);
return 0;
@@ -159,7 +159,7 @@
/* NCP over UDP returns 0 (!!!) */
result = ntohs(ncp_reply_word(server, 0));
if (result >= NCP_BLOCK_SIZE)
- size = min(int, result, size);
+ size = min(result, size);
*ret_size = size;
*ret_options = ncp_reply_byte(server, 4);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)