aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-02-27 00:07:27 +0000
committerwdenk <wdenk>2004-02-27 00:07:27 +0000
commit11dadd547c08a3480ea153482e99c6ae70b73415 (patch)
tree2386e4f325ab15e52cfadcb34c3d8ba8e36fb977 /net
parent80885a9d526b6b9666500d17ec7941b9dad8de44 (diff)
* Patch by Steven Scholz, 25 Feb 2004:
- Timeouts in FPGA code should be based on CFG_HZ - Minor cleanup in code for Altera FPGA ACEX1K * Patch by Steven Scholz, 25 Feb 2004: Changed "Directory Hierarchy" section in README * Patch by Masami Komiya, 25 Feb 2004: Reduce copy count in nfs_read_reply() of NFS code
Diffstat (limited to 'net')
-rw-r--r--net/nfs.c4
-rw-r--r--net/nfs.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/net/nfs.c b/net/nfs.c
index 069f07257..2363d61a3 100644
--- a/net/nfs.c
+++ b/net/nfs.c
@@ -542,7 +542,7 @@ nfs_read_reply (uchar *pkt, unsigned len)
printf ("%s\n", __FUNCTION__);
#endif
- memcpy ((uchar *)&rpc_pkt, pkt, len);
+ memcpy ((uchar *)&rpc_pkt, pkt, sizeof(rpc_pkt.u.reply));
if (rpc_pkt.u.reply.rstatus ||
rpc_pkt.u.reply.verifier ||
@@ -565,7 +565,7 @@ nfs_read_reply (uchar *pkt, unsigned len)
}
rlen = ntohl(rpc_pkt.u.reply.data[18]);
- store_block ((uchar *)&(rpc_pkt.u.reply.data[19]), nfs_offset, rlen);
+ store_block ((uchar *)pkt+sizeof(rpc_pkt.u.reply), nfs_offset, rlen);
return rlen;
}
diff --git a/net/nfs.h b/net/nfs.h
index ebd426685..712afa089 100644
--- a/net/nfs.h
+++ b/net/nfs.h
@@ -62,7 +62,7 @@ struct rpc_t {
uint32_t verifier;
uint32_t v2;
uint32_t astatus;
- uint32_t data[1];
+ uint32_t data[19];
} reply;
} u;
};