diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 14:38:13 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 14:38:13 -0500 |
| commit | cb18eccff48ef3986d1072964590bce6fec705fb (patch) | |
| tree | 777fb1d15e0281341e1e02c9803d989538d346f2 /net/sunrpc/pmap_clnt.c | |
| parent | c827ba4cb49a30ce581201fd0ba2be77cde412c7 (diff) | |
| parent | 5ef213f6842277ee1df5659f59fac0ffc9beb411 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (45 commits)
[IPV4]: Restore multipath routing after rt_next changes.
[XFRM] IPV6: Fix outbound RO transformation which is broken by IPsec tunnel patch.
[NET]: Reorder fields of struct dst_entry
[DECNET]: Convert decnet route to use the new dst_entry 'next' pointer
[IPV6]: Convert ipv6 route to use the new dst_entry 'next' pointer
[IPV4]: Convert ipv4 route to use the new dst_entry 'next' pointer
[NET]: Introduce union in struct dst_entry to hold 'next' pointer
[DECNET]: fix misannotation of linkinfo_dn
[DECNET]: FRA_{DST,SRC} are le16 for decnet
[UDP]: UDP can use sk_hash to speedup lookups
[NET]: Fix whitespace errors.
[NET] XFRM: Fix whitespace errors.
[NET] X25: Fix whitespace errors.
[NET] WANROUTER: Fix whitespace errors.
[NET] UNIX: Fix whitespace errors.
[NET] TIPC: Fix whitespace errors.
[NET] SUNRPC: Fix whitespace errors.
[NET] SCTP: Fix whitespace errors.
[NET] SCHED: Fix whitespace errors.
[NET] RXRPC: Fix whitespace errors.
...
Diffstat (limited to 'net/sunrpc/pmap_clnt.c')
| -rw-r--r-- | net/sunrpc/pmap_clnt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sunrpc/pmap_clnt.c b/net/sunrpc/pmap_clnt.c index 3946ec3eb517..f4e1357bc186 100644 --- a/net/sunrpc/pmap_clnt.c +++ b/net/sunrpc/pmap_clnt.c | |||
| @@ -329,7 +329,7 @@ static int xdr_decode_bool(struct rpc_rqst *req, __be32 *p, unsigned int *boolp) | |||
| 329 | static struct rpc_procinfo pmap_procedures[] = { | 329 | static struct rpc_procinfo pmap_procedures[] = { |
| 330 | [PMAP_SET] = { | 330 | [PMAP_SET] = { |
| 331 | .p_proc = PMAP_SET, | 331 | .p_proc = PMAP_SET, |
| 332 | .p_encode = (kxdrproc_t) xdr_encode_mapping, | 332 | .p_encode = (kxdrproc_t) xdr_encode_mapping, |
| 333 | .p_decode = (kxdrproc_t) xdr_decode_bool, | 333 | .p_decode = (kxdrproc_t) xdr_decode_bool, |
| 334 | .p_bufsiz = 4, | 334 | .p_bufsiz = 4, |
| 335 | .p_count = 1, | 335 | .p_count = 1, |
| @@ -338,7 +338,7 @@ static struct rpc_procinfo pmap_procedures[] = { | |||
| 338 | }, | 338 | }, |
| 339 | [PMAP_UNSET] = { | 339 | [PMAP_UNSET] = { |
| 340 | .p_proc = PMAP_UNSET, | 340 | .p_proc = PMAP_UNSET, |
| 341 | .p_encode = (kxdrproc_t) xdr_encode_mapping, | 341 | .p_encode = (kxdrproc_t) xdr_encode_mapping, |
| 342 | .p_decode = (kxdrproc_t) xdr_decode_bool, | 342 | .p_decode = (kxdrproc_t) xdr_decode_bool, |
| 343 | .p_bufsiz = 4, | 343 | .p_bufsiz = 4, |
| 344 | .p_count = 1, | 344 | .p_count = 1, |