From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 28 Apr 2008 16:44:11 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.26-rc1~715
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77a50df2b14c8d3ee3c58c21c4a0e0157570df09;p=linux-2.6

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.
---

77a50df2b14c8d3ee3c58c21c4a0e0157570df09
diff --cc net/sunrpc/xprt.c
index 75d748eee0,61880cc90e..e1770f7ba0
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@@ -445,9 -445,9 +445,9 @@@ EXPORT_SYMBOL_GPL(xprt_wake_pending_tas
  /**
   * xprt_wait_for_buffer_space - wait for transport output buffer to clear
   * @task: task to be put to sleep
-  *
+  * @action: function pointer to be executed after wait
   */
 -void xprt_wait_for_buffer_space(struct rpc_task *task)
 +void xprt_wait_for_buffer_space(struct rpc_task *task, rpc_action action)
  {
  	struct rpc_rqst *req = task->tk_rqstp;
  	struct rpc_xprt *xprt = req->rq_xprt;