3 files changed, 37 insertions, 9 deletions

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 702ede309b06..61c3abeaccae 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -55,6 +55,7 @@ static void	call_bind(struct rpc_task *task);
 static void     call_bind_status(struct rpc_task *task);
 static void     call_transmit(struct rpc_task *task);
 static void     call_status(struct rpc_task *task);
+static void     call_transmit_status(struct rpc_task *task);
 static void     call_refresh(struct rpc_task *task);
 static void     call_refreshresult(struct rpc_task *task);
 static void     call_timeout(struct rpc_task *task);
@@ -672,6 +673,18 @@ call_allocate(struct rpc_task *task)
         rpc_exit(task, -ERESTARTSYS);
 }
 
+static inline int
+rpc_task_need_encode(struct rpc_task *task)
+{
+        return task->tk_rqstp->rq_snd_buf.len == 0;
+}
+
+static inline void
+rpc_task_force_reencode(struct rpc_task *task)
+{
+        task->tk_rqstp->rq_snd_buf.len = 0;
+}
+
 /*
  * 3.   Encode arguments of an RPC call
  */
@@ -867,12 +880,14 @@ call_transmit(struct rpc_task *task)
         if (task->tk_status != 0)
                 return;
         /* Encode here so that rpcsec_gss can use correct sequence number. */
-        if (task->tk_rqstp->rq_bytes_sent == 0) {
+        if (rpc_task_need_encode(task)) {
+                task->tk_rqstp->rq_bytes_sent = 0;
                 call_encode(task);
                 /* Did the encode result in an error condition? */
                 if (task->tk_status != 0)
                         goto out_nosend;
         }
+        task->tk_action = call_transmit_status;
         xprt_transmit(task);
         if (task->tk_status < 0)
                 return;
@@ -884,6 +899,7 @@ call_transmit(struct rpc_task *task)
 out_nosend:
         /* release socket write lock before attempting to handle error */
         xprt_abort_transmit(task);
+        rpc_task_force_reencode(task);
 }
 
 /*
@@ -915,7 +931,6 @@ call_status(struct rpc_task *task)
                 break;
         case -ECONNREFUSED:
         case -ENOTCONN:
-                req->rq_bytes_sent = 0;
                 if (clnt->cl_autobind)
                         clnt->cl_port = 0;
                 task->tk_action = call_bind;
@@ -937,7 +952,18 @@ call_status(struct rpc_task *task)
 }
 
 /*
- * 6a.  Handle RPC timeout
+ * 6a.  Handle transmission errors.
+ */
+static void
+call_transmit_status(struct rpc_task *task)
+{
+        if (task->tk_status != -EAGAIN)
+                rpc_task_force_reencode(task);
+        call_status(task);
+}
+
+/*
+ * 6b.  Handle RPC timeout
  *      We do not release the request slot, so we keep using the
  *      same XID for all retransmits.
  */
diff --git a/net/sunrpc/socklib.c b/net/sunrpc/socklib.c
index 8f97e90f36c8..eb330d4f66d6 100644
--- a/net/sunrpc/socklib.c
+++ b/net/sunrpc/socklib.c
@@ -6,6 +6,9 @@
  * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
  */
 
+#include <linux/compiler.h>
+#include <linux/netdevice.h>
+#include <linux/skbuff.h>
 #include <linux/types.h>
 #include <linux/pagemap.h>
 #include <linux/udp.h>
@@ -165,6 +168,8 @@ int csum_partial_copy_to_xdr(struct xdr_buf *xdr, struct sk_buff *skb)
                 return -1;
         if ((unsigned short)csum_fold(desc.csum))
                 return -1;
+        if (unlikely(skb->ip_summed == CHECKSUM_HW))
+                netdev_rx_csum_fault(skb->dev);
         return 0;
 no_checksum:
         if (xdr_partial_copy_from_skb(xdr, 0, &desc, skb_read_bits) < 0)
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index f16e7cdd6150..e50e7cf43737 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -623,12 +623,9 @@ svc_udp_recvfrom(struct svc_rqst *rqstp)
                 /* we can use it in-place */
                 rqstp->rq_arg.head[0].iov_base = skb->data + sizeof(struct udphdr);
                 rqstp->rq_arg.head[0].iov_len = len;
-                if (skb->ip_summed != CHECKSUM_UNNECESSARY) {
-                        if ((unsigned short)csum_fold(skb_checksum(skb, 0, skb->len, skb->csum))) {
-                                skb_free_datagram(svsk->sk_sk, skb);
-                                return 0;
-                        }
-                        skb->ip_summed = CHECKSUM_UNNECESSARY;
+                if (skb_checksum_complete(skb)) {
+                        skb_free_datagram(svsk->sk_sk, skb);
+                        return 0;
                 }
                 rqstp->rq_skbuff = skb;
         }