diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-27 13:10:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-27 13:10:40 -0400 |
| commit | 0f5a2c553d1484141ebb369ecab61894e9cb074f (patch) | |
| tree | ba7667fb37832e1714dc2a8b3b3e45dade4af5cb /net/sunrpc/xdr.c | |
| parent | 26adc0d5859788b74f86677538236f807e6d9021 (diff) | |
| parent | 68e3f5dd4db62619fdbe520d36c9ebf62e672256 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[CRYPTO] users: Fix up scatterlist conversion errors
[CRYPTO] tcrypt: Move sg_init_table out of timing loops
[NETNS]: Fix get_net_ns_by_pid
[NET]: Marking struct pernet_operations __net_initdata was inappropriate
[INET] ESP: Must #include <linux/scatterlist.h>
[TCP] IPV6: fix softnet build breakage
Diffstat (limited to 'net/sunrpc/xdr.c')
| -rw-r--r-- | net/sunrpc/xdr.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c index f38dac30481b..fdc5e6d7562b 100644 --- a/net/sunrpc/xdr.c +++ b/net/sunrpc/xdr.c | |||
| @@ -1030,6 +1030,8 @@ xdr_process_buf(struct xdr_buf *buf, unsigned int offset, unsigned int len, | |||
| 1030 | unsigned page_len, thislen, page_offset; | 1030 | unsigned page_len, thislen, page_offset; |
| 1031 | struct scatterlist sg[1]; | 1031 | struct scatterlist sg[1]; |
| 1032 | 1032 | ||
| 1033 | sg_init_table(sg, 1); | ||
| 1034 | |||
| 1033 | if (offset >= buf->head[0].iov_len) { | 1035 | if (offset >= buf->head[0].iov_len) { |
| 1034 | offset -= buf->head[0].iov_len; | 1036 | offset -= buf->head[0].iov_len; |
| 1035 | } else { | 1037 | } else { |