diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
| commit | 27b030d58c8e72fc7a95187a791bd9406e350f02 (patch) | |
| tree | ab3bab7f39a5ce5bab65578a7e08fa4dfdeb198c /net/sunrpc/xdr.c | |
| parent | 79d20b14a0d651f15b0ef9a22b6cf12d284a6d38 (diff) | |
| parent | 6628465e33ca694bd8fd5c3cf4eb7ff9177bc694 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'net/sunrpc/xdr.c')
| -rw-r--r-- | net/sunrpc/xdr.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c index 4484931018eb..67b9f035ba86 100644 --- a/net/sunrpc/xdr.c +++ b/net/sunrpc/xdr.c | |||
| @@ -46,9 +46,9 @@ xdr_decode_netobj(u32 *p, struct xdr_netobj *obj) | |||
| 46 | 46 | ||
| 47 | /** | 47 | /** |
| 48 | * xdr_encode_opaque_fixed - Encode fixed length opaque data | 48 | * xdr_encode_opaque_fixed - Encode fixed length opaque data |
| 49 | * @p - pointer to current position in XDR buffer. | 49 | * @p: pointer to current position in XDR buffer. |
| 50 | * @ptr - pointer to data to encode (or NULL) | 50 | * @ptr: pointer to data to encode (or NULL) |
| 51 | * @nbytes - size of data. | 51 | * @nbytes: size of data. |
| 52 | * | 52 | * |
| 53 | * Copy the array of data of length nbytes at ptr to the XDR buffer | 53 | * Copy the array of data of length nbytes at ptr to the XDR buffer |
| 54 | * at position p, then align to the next 32-bit boundary by padding | 54 | * at position p, then align to the next 32-bit boundary by padding |
| @@ -76,9 +76,9 @@ EXPORT_SYMBOL(xdr_encode_opaque_fixed); | |||
| 76 | 76 | ||
| 77 | /** | 77 | /** |
| 78 | * xdr_encode_opaque - Encode variable length opaque data | 78 | * xdr_encode_opaque - Encode variable length opaque data |
| 79 | * @p - pointer to current position in XDR buffer. | 79 | * @p: pointer to current position in XDR buffer. |
| 80 | * @ptr - pointer to data to encode (or NULL) | 80 | * @ptr: pointer to data to encode (or NULL) |
| 81 | * @nbytes - size of data. | 81 | * @nbytes: size of data. |
| 82 | * | 82 | * |
| 83 | * Returns the updated current XDR buffer position | 83 | * Returns the updated current XDR buffer position |
| 84 | */ | 84 | */ |