diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 12:44:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 12:44:11 -0400 |
| commit | 77a50df2b14c8d3ee3c58c21c4a0e0157570df09 (patch) | |
| tree | 0e324a712e5e768c8353b0b5ba6ddc31095479f0 /net/sunrpc/xprt.c | |
| parent | 96fffeb4b413a4f8f65bb627d59b7dfc97ea0b39 (diff) | |
| parent | 358c12953b88c5a06a57c33eb27c753b2e7934d1 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
iwlwifi: Allow building iwl3945 without iwl4965.
wireless: Fix compile error with wifi & leds
tcp: Fix slab corruption with ipv6 and tcp6fuzz
ipv4/ipv6 compat: Fix SSM applications on 64bit kernels.
[IPSEC]: Use digest_null directly for auth
sunrpc: fix missing kernel-doc
can: Fix copy_from_user() results interpretation
Revert "ipv6: Fix typo in net/ipv6/Kconfig"
tipc: endianness annotations
ipv6: result of csum_fold() is already 16bit, no need to cast
[XFRM] AUDIT: Fix flowlabel text format ambibuity.
Diffstat (limited to 'net/sunrpc/xprt.c')
| -rw-r--r-- | net/sunrpc/xprt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index 75d748eee0eb..e1770f7ba0b3 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c | |||
| @@ -445,7 +445,7 @@ EXPORT_SYMBOL_GPL(xprt_wake_pending_tasks); | |||
| 445 | /** | 445 | /** |
| 446 | * xprt_wait_for_buffer_space - wait for transport output buffer to clear | 446 | * xprt_wait_for_buffer_space - wait for transport output buffer to clear |
| 447 | * @task: task to be put to sleep | 447 | * @task: task to be put to sleep |
| 448 | * | 448 | * @action: function pointer to be executed after wait |
| 449 | */ | 449 | */ |
| 450 | void xprt_wait_for_buffer_space(struct rpc_task *task, rpc_action action) | 450 | void xprt_wait_for_buffer_space(struct rpc_task *task, rpc_action action) |
| 451 | { | 451 | { |