Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[pandora-kernel.git] / net / rxrpc / ar-error.c

diff --git a/net/rxrpc/ar-error.c b/net/rxrpc/ar-error.c
index 6cb3e88..5d6b572 100644 (file)
--- a/net/rxrpc/ar-error.c
+++ b/net/rxrpc/ar-error.c
@@ -49,8 +49,7 @@ void rxrpc_UDP_error_report(struct sock *sk)
        addr = *(__be32 *)(skb_network_header(skb) + serr->addr_offset);
        port = serr->port;
 
-       _net("Rx UDP Error from "NIPQUAD_FMT":%hu",
-            NIPQUAD(addr), ntohs(port));
+       _net("Rx UDP Error from %pI4:%hu", &addr, ntohs(port));
        _debug("Msg l:%d d:%d", skb->len, skb->data_len);
 
        peer = rxrpc_find_peer(local, addr, port);
@@ -140,7 +139,7 @@ void rxrpc_UDP_error_handler(struct work_struct *work)
        struct rxrpc_transport *trans =
                container_of(work, struct rxrpc_transport, error_handler);
        struct sk_buff *skb;
-       int local, err;
+       int err;
 
        _enter("");
 
@@ -158,7 +157,6 @@ void rxrpc_UDP_error_handler(struct work_struct *work)
 
        switch (ee->ee_origin) {
        case SO_EE_ORIGIN_ICMP:
-               local = 0;
                switch (ee->ee_type) {
                case ICMP_DEST_UNREACH:
                        switch (ee->ee_code) {
@@ -208,7 +206,6 @@ void rxrpc_UDP_error_handler(struct work_struct *work)
        case SO_EE_ORIGIN_LOCAL:
                _proto("Rx Received local error { error=%d }",
                       ee->ee_errno);
-               local = 1;
                break;
 
        case SO_EE_ORIGIN_NONE:
@@ -216,7 +213,6 @@ void rxrpc_UDP_error_handler(struct work_struct *work)
        default:
                _proto("Rx Received error report { orig=%u }",
                       ee->ee_origin);
-               local = 0;
                break;
        }