bridge: update sysfs link names if port device names have changed

[safe/jmp/linux-2.6] / net / rxrpc / ar-peer.c

diff --git a/net/rxrpc/ar-peer.c b/net/rxrpc/ar-peer.c
index ce08b78..f0f85b0 100644 (file)
--- a/net/rxrpc/ar-peer.c
+++ b/net/rxrpc/ar-peer.c
@@ -16,6 +16,7 @@
 #include <linux/in.h>
 #include <linux/in6.h>
 #include <linux/icmp.h>
+#include <linux/slab.h>
 #include <net/sock.h>
 #include <net/af_rxrpc.h>
 #include <net/ip.h>
@@ -57,16 +58,16 @@ static void rxrpc_assess_MTU_size(struct rxrpc_peer *peer)
                BUG();
        }
 
-       ret = ip_route_output_key(&rt, &fl);
+       ret = ip_route_output_key(&init_net, &rt, &fl);
        if (ret < 0) {
-               kleave(" [route err %d]", ret);
+               _leave(" [route err %d]", ret);
                return;
        }
 
        peer->if_mtu = dst_mtu(&rt->u.dst);
        dst_release(&rt->u.dst);
 
-       kleave(" [if_mtu %u]", peer->if_mtu);
+       _leave(" [if_mtu %u]", peer->if_mtu);
 }
 
 /*
@@ -123,10 +124,10 @@ struct rxrpc_peer *rxrpc_get_peer(struct sockaddr_rxrpc *srx, gfp_t gfp)
        const char *new = "old";
        int usage;
 
-       _enter("{%d,%d,%u.%u.%u.%u+%hu}",
+       _enter("{%d,%d,%pI4+%hu}",
               srx->transport_type,
               srx->transport_len,
-              NIPQUAD(srx->transport.sin.sin_addr),
+              &srx->transport.sin.sin_addr,
               ntohs(srx->transport.sin.sin_port));
 
        /* search the peer list first */
@@ -177,12 +178,12 @@ struct rxrpc_peer *rxrpc_get_peer(struct sockaddr_rxrpc *srx, gfp_t gfp)
        new = "new";
 
 success:
-       _net("PEER %s %d {%d,%u,%u.%u.%u.%u+%hu}",
+       _net("PEER %s %d {%d,%u,%pI4+%hu}",
             new,
             peer->debug_id,
             peer->srx.transport_type,
             peer->srx.transport.family,
-            NIPQUAD(peer->srx.transport.sin.sin_addr),
+            &peer->srx.transport.sin.sin_addr,
             ntohs(peer->srx.transport.sin.sin_port));
 
        _leave(" = %p {u=%d}", peer, atomic_read(&peer->usage));