Merge tag 'nfs-for-4.6-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[deliverable/linux.git] / net / rxrpc / ar-error.c

diff --git a/net/rxrpc/ar-error.c b/net/rxrpc/ar-error.c
index 0610efa83d721389fc0f2c3597f3e284fee341d7..3e82d6f0313c49563ecd10854985f84f676567f4 100644 (file)
--- a/net/rxrpc/ar-error.c
+++ b/net/rxrpc/ar-error.c
@@ -115,7 +115,6 @@ void rxrpc_UDP_error_report(struct sock *sk)
        /* pass the transport ref to error_handler to release */
        skb_queue_tail(&trans->error_queue, skb);
        rxrpc_queue_work(&trans->error_handler);
-
        _leave("");
 }
 
@@ -152,28 +151,18 @@ void rxrpc_UDP_error_handler(struct work_struct *work)
                        switch (ee->ee_code) {
                        case ICMP_NET_UNREACH:
                                _net("Rx Received ICMP Network Unreachable");
-                               err = ENETUNREACH;
                                break;
                        case ICMP_HOST_UNREACH:
                                _net("Rx Received ICMP Host Unreachable");
-                               err = EHOSTUNREACH;
                                break;
                        case ICMP_PORT_UNREACH:
                                _net("Rx Received ICMP Port Unreachable");
-                               err = ECONNREFUSED;
-                               break;
-                       case ICMP_FRAG_NEEDED:
-                               _net("Rx Received ICMP Fragmentation Needed (%d)",
-                                    ee->ee_info);
-                               err = 0; /* dealt with elsewhere */
                                break;
                        case ICMP_NET_UNKNOWN:
                                _net("Rx Received ICMP Unknown Network");
-                               err = ENETUNREACH;
                                break;
                        case ICMP_HOST_UNKNOWN:
                                _net("Rx Received ICMP Unknown Host");
-                               err = EHOSTUNREACH;
                                break;
                        default:
                                _net("Rx Received ICMP DestUnreach code=%u",
@@ -222,7 +211,7 @@ void rxrpc_UDP_error_handler(struct work_struct *work)
                        if (call->state != RXRPC_CALL_COMPLETE &&
                            call->state < RXRPC_CALL_NETWORK_ERROR) {
                                call->state = RXRPC_CALL_NETWORK_ERROR;
-                               set_bit(RXRPC_CALL_RCVD_ERROR, &call->events);
+                               set_bit(RXRPC_CALL_EV_RCVD_ERROR, &call->events);
                                rxrpc_queue_call(call);
                        }
                        write_unlock(&call->state_lock);