Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1429 commits)
  net: Allow dependancies of FDDI & Tokenring to be modular.
  igb: Fix build warning when DCA is disabled.
  net: Fix warning fallout from recent NAPI interface changes.
  gro: Fix potential use after free
  sfc: If AN is enabled, always read speed/duplex from the AN advertising bits
  sfc: When disabling the NIC, close the device rather than unregistering it
  sfc: SFT9001: Add cable diagnostics
  sfc: Add support for multiple PHY self-tests
  sfc: Merge top-level functions for self-tests
  sfc: Clean up PHY mode management in loopback self-test
  sfc: Fix unreliable link detection in some loopback modes
  sfc: Generate unique names for per-NIC workqueues
  802.3ad: use standard ethhdr instead of ad_header
  802.3ad: generalize out mac address initializer
  802.3ad: initialize ports LACPDU from const initializer
  802.3ad: remove typedef around ad_system
  802.3ad: turn ports is_individual into a bool
  802.3ad: turn ports is_enabled into a bool
  802.3ad: make ntt bool
  ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
  ...

Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due
to the conversion to %pI (in this networking merge) and the addition of
doing IPv6 addresses (from the earlier merge of CIFS).

10 files changed, 67 insertions, 81 deletions

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 4895c341e46d..3ca518386d15 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -271,15 +271,15 @@ struct rpc_clnt *rpc_create(struct rpc_create_args *args)
                 case AF_INET: {
                         struct sockaddr_in *sin =
                                         (struct sockaddr_in *)args->address;
-                        snprintf(servername, sizeof(servername), NIPQUAD_FMT,
-                                 NIPQUAD(sin->sin_addr.s_addr));
+                        snprintf(servername, sizeof(servername), "%pI4",
+                                 &sin->sin_addr.s_addr);
                         break;
                 }
                 case AF_INET6: {
                         struct sockaddr_in6 *sin =
                                         (struct sockaddr_in6 *)args->address;
-                        snprintf(servername, sizeof(servername), NIP6_FMT,
-                                 NIP6(sin->sin6_addr));
+                        snprintf(servername, sizeof(servername), "%pI6",
+                                 &sin->sin6_addr);
                         break;
                 }
                 default:
diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
index 41013dd66ac3..03ae007641e4 100644
--- a/net/sunrpc/rpcb_clnt.c
+++ b/net/sunrpc/rpcb_clnt.c
@@ -270,10 +270,9 @@ static int rpcb_register_netid4(struct sockaddr_in *address_to_register,
         char buf[32];
 
         /* Construct AF_INET universal address */
-        snprintf(buf, sizeof(buf),
-                        NIPQUAD_FMT".%u.%u",
-                        NIPQUAD(address_to_register->sin_addr.s_addr),
-                        port >> 8, port & 0xff);
+        snprintf(buf, sizeof(buf), "%pI4.%u.%u",
+                 &address_to_register->sin_addr.s_addr,
+                 port >> 8, port & 0xff);
         map->r_addr = buf;
 
         dprintk("RPC:       %sregistering [%u, %u, %s, '%s'] with "
@@ -305,9 +304,9 @@ static int rpcb_register_netid6(struct sockaddr_in6 *address_to_register,
                 snprintf(buf, sizeof(buf), "::.%u.%u",
                                 port >> 8, port & 0xff);
         else
-                snprintf(buf, sizeof(buf), NIP6_FMT".%u.%u",
-                                NIP6(address_to_register->sin6_addr),
-                                port >> 8, port & 0xff);
+                snprintf(buf, sizeof(buf), "%pI6.%u.%u",
+                         &address_to_register->sin6_addr,
+                         port >> 8, port & 0xff);
         map->r_addr = buf;
 
         dprintk("RPC:       %sregistering [%u, %u, %s, '%s'] with "
@@ -422,8 +421,8 @@ int rpcb_getport_sync(struct sockaddr_in *sin, u32 prog, u32 vers, int prot)
         struct rpc_clnt *rpcb_clnt;
         int status;
 
-        dprintk("RPC:       %s(" NIPQUAD_FMT ", %u, %u, %d)\n",
-                __func__, NIPQUAD(sin->sin_addr.s_addr), prog, vers, prot);
+        dprintk("RPC:       %s(%pI4, %u, %u, %d)\n",
+                __func__, &sin->sin_addr.s_addr, prog, vers, prot);
 
         rpcb_clnt = rpcb_create(NULL, (struct sockaddr *)sin,
                                 sizeof(*sin), prot, RPCBVERS_2);
diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
index f24800f2c098..82240e6127b2 100644
--- a/net/sunrpc/svcauth_unix.c
+++ b/net/sunrpc/svcauth_unix.c
@@ -162,13 +162,9 @@ static void ip_map_request(struct cache_detail *cd,
         struct ip_map *im = container_of(h, struct ip_map, h);
 
         if (ipv6_addr_v4mapped(&(im->m_addr))) {
-                snprintf(text_addr, 20, NIPQUAD_FMT,
-                                ntohl(im->m_addr.s6_addr32[3]) >> 24 & 0xff,
-                                ntohl(im->m_addr.s6_addr32[3]) >> 16 & 0xff,
-                                ntohl(im->m_addr.s6_addr32[3]) >>  8 & 0xff,
-                                ntohl(im->m_addr.s6_addr32[3]) >>  0 & 0xff);
+                snprintf(text_addr, 20, "%pI4", &im->m_addr.s6_addr32[3]);
         } else {
-                snprintf(text_addr, 40, NIP6_FMT, NIP6(im->m_addr));
+                snprintf(text_addr, 40, "%pI6", &im->m_addr);
         }
         qword_add(bpp, blen, im->m_class);
         qword_add(bpp, blen, text_addr);
@@ -208,13 +204,13 @@ static int ip_map_parse(struct cache_detail *cd,
         len = qword_get(&mesg, buf, mlen);
         if (len <= 0) return -EINVAL;
 
-        if (sscanf(buf, NIPQUAD_FMT "%c", &b1, &b2, &b3, &b4, &c) == 4) {
+        if (sscanf(buf, "%u.%u.%u.%u%c", &b1, &b2, &b3, &b4, &c) == 4) {
                 addr.s6_addr32[0] = 0;
                 addr.s6_addr32[1] = 0;
                 addr.s6_addr32[2] = htonl(0xffff);
                 addr.s6_addr32[3] =
                         htonl((((((b1<<8)|b2)<<8)|b3)<<8)|b4);
-       } else if (sscanf(buf, NIP6_FMT "%c",
+       } else if (sscanf(buf, "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x%c",
                         &b1, &b2, &b3, &b4, &b5, &b6, &b7, &b8, &c) == 8) {
                 addr.s6_addr16[0] = htons(b1);
                 addr.s6_addr16[1] = htons(b2);
@@ -278,16 +274,10 @@ static int ip_map_show(struct seq_file *m,
                 dom = im->m_client->h.name;
 
         if (ipv6_addr_v4mapped(&addr)) {
-                seq_printf(m, "%s " NIPQUAD_FMT " %s\n",
-                        im->m_class,
-                        ntohl(addr.s6_addr32[3]) >> 24 & 0xff,
-                        ntohl(addr.s6_addr32[3]) >> 16 & 0xff,
-                        ntohl(addr.s6_addr32[3]) >>  8 & 0xff,
-                        ntohl(addr.s6_addr32[3]) >>  0 & 0xff,
-                        dom);
+                seq_printf(m, "%s %pI4 %s\n",
+                        im->m_class, &addr.s6_addr32[3], dom);
         } else {
-                seq_printf(m, "%s " NIP6_FMT " %s\n",
-                        im->m_class, NIP6(addr), dom);
+                seq_printf(m, "%s %pI6 %s\n", im->m_class, &addr, dom);
         }
         return 0;
 }
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index a1951dcc5776..ef3238d665ee 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -250,10 +250,10 @@ static int one_sock_name(char *buf, struct svc_sock *svsk)
 
         switch(svsk->sk_sk->sk_family) {
         case AF_INET:
-                len = sprintf(buf, "ipv4 %s %u.%u.%u.%u %d\n",
-                              svsk->sk_sk->sk_protocol==IPPROTO_UDP?
+                len = sprintf(buf, "ipv4 %s %pI4 %d\n",
+                              svsk->sk_sk->sk_protocol == IPPROTO_UDP ?
                               "udp" : "tcp",
-                              NIPQUAD(inet_sk(svsk->sk_sk)->rcv_saddr),
+                              &inet_sk(svsk->sk_sk)->rcv_saddr,
                               inet_sk(svsk->sk_sk)->num);
                 break;
         default:
diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
index a4756576d687..629a28764da9 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
@@ -646,8 +646,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
         ret = rdma_read_xdr(rdma_xprt, rmsgp, rqstp, ctxt);
         if (ret > 0) {
                 /* read-list posted, defer until data received from client. */
-                svc_xprt_received(xprt);
-                return 0;
+                goto defer;
         }
         if (ret < 0) {
                 /* Post of read-list failed, free context. */
@@ -679,6 +678,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
          * close bit and call svc_xprt_delete
          */
         set_bit(XPT_CLOSE, &xprt->xpt_flags);
+defer:
         svc_xprt_received(xprt);
         return 0;
 }
diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
index 9a7a8e7ae038..a3334e3b73cc 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
@@ -69,7 +69,7 @@
  * array is only concerned with the reply we are assured that we have
  * on extra page for the RPCRMDA header.
  */
-int fast_reg_xdr(struct svcxprt_rdma *xprt,
+static int fast_reg_xdr(struct svcxprt_rdma *xprt,
                  struct xdr_buf *xdr,
                  struct svc_rdma_req_map *vec)
 {
diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
index 6fb493cbd29f..3d810e7df3fb 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
@@ -61,7 +61,7 @@ static int svc_rdma_has_wspace(struct svc_xprt *xprt);
 static void rq_cq_reap(struct svcxprt_rdma *xprt);
 static void sq_cq_reap(struct svcxprt_rdma *xprt);
 
-DECLARE_TASKLET(dto_tasklet, dto_tasklet_func, 0UL);
+static DECLARE_TASKLET(dto_tasklet, dto_tasklet_func, 0UL);
 static DEFINE_SPINLOCK(dto_lock);
 static LIST_HEAD(dto_xprt_q);
 
@@ -827,7 +827,7 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt)
         struct rdma_conn_param conn_param;
         struct ib_qp_init_attr qp_attr;
         struct ib_device_attr devattr;
-        int dma_mr_acc;
+        int uninitialized_var(dma_mr_acc);
         int need_dma_mr;
         int ret;
         int i;
@@ -1048,21 +1048,21 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt)
 
         dprintk("svcrdma: new connection %p accepted with the following "
                 "attributes:\n"
-                "    local_ip        : %d.%d.%d.%d\n"
+                "    local_ip        : %pI4\n"
                 "    local_port      : %d\n"
-                "    remote_ip       : %d.%d.%d.%d\n"
+                "    remote_ip       : %pI4\n"
                 "    remote_port     : %d\n"
                 "    max_sge         : %d\n"
                 "    sq_depth        : %d\n"
                 "    max_requests    : %d\n"
                 "    ord             : %d\n",
                 newxprt,
-                NIPQUAD(((struct sockaddr_in *)&newxprt->sc_cm_id->
-                         route.addr.src_addr)->sin_addr.s_addr),
+                &((struct sockaddr_in *)&newxprt->sc_cm_id->
+                         route.addr.src_addr)->sin_addr.s_addr,
                 ntohs(((struct sockaddr_in *)&newxprt->sc_cm_id->
                        route.addr.src_addr)->sin_port),
-                NIPQUAD(((struct sockaddr_in *)&newxprt->sc_cm_id->
-                         route.addr.dst_addr)->sin_addr.s_addr),
+                &((struct sockaddr_in *)&newxprt->sc_cm_id->
+                         route.addr.dst_addr)->sin_addr.s_addr,
                 ntohs(((struct sockaddr_in *)&newxprt->sc_cm_id->
                        route.addr.dst_addr)->sin_port),
                 newxprt->sc_max_sge,
diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c
index 9839c3d94145..1dd6123070e9 100644
--- a/net/sunrpc/xprtrdma/transport.c
+++ b/net/sunrpc/xprtrdma/transport.c
@@ -174,7 +174,7 @@ xprt_rdma_format_addresses(struct rpc_xprt *xprt)
 
         buf = kzalloc(20, GFP_KERNEL);
         if (buf)
-                snprintf(buf, 20, NIPQUAD_FMT, NIPQUAD(addr->sin_addr.s_addr));
+                snprintf(buf, 20, "%pI4", &addr->sin_addr.s_addr);
         xprt->address_strings[RPC_DISPLAY_ADDR] = buf;
 
         buf = kzalloc(8, GFP_KERNEL);
@@ -186,8 +186,8 @@ xprt_rdma_format_addresses(struct rpc_xprt *xprt)
 
         buf = kzalloc(48, GFP_KERNEL);
         if (buf)
-                snprintf(buf, 48, "addr="NIPQUAD_FMT" port=%u proto=%s",
-                        NIPQUAD(addr->sin_addr.s_addr),
+                snprintf(buf, 48, "addr=%pI4 port=%u proto=%s",
+                        &addr->sin_addr.s_addr,
                         ntohs(addr->sin_port), "rdma");
         xprt->address_strings[RPC_DISPLAY_ALL] = buf;
 
@@ -204,8 +204,8 @@ xprt_rdma_format_addresses(struct rpc_xprt *xprt)
 
         buf = kzalloc(30, GFP_KERNEL);
         if (buf)
-                snprintf(buf, 30, NIPQUAD_FMT".%u.%u",
-                        NIPQUAD(addr->sin_addr.s_addr),
+                snprintf(buf, 30, "%pI4.%u.%u",
+                        &addr->sin_addr.s_addr,
                         ntohs(addr->sin_port) >> 8,
                         ntohs(addr->sin_port) & 0xff);
         xprt->address_strings[RPC_DISPLAY_UNIVERSAL_ADDR] = buf;
@@ -369,8 +369,8 @@ xprt_setup_rdma(struct xprt_create *args)
         if (ntohs(sin->sin_port) != 0)
                 xprt_set_bound(xprt);
 
-        dprintk("RPC:       %s: %u.%u.%u.%u:%u\n", __func__,
-                        NIPQUAD(sin->sin_addr.s_addr), ntohs(sin->sin_port));
+        dprintk("RPC:       %s: %pI4:%u\n",
+                __func__, &sin->sin_addr.s_addr, ntohs(sin->sin_port));
 
         /* Set max requests */
         cdata.max_requests = xprt->max_reqs;
diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
index a5fef5e6c323..3b21e0cc5e69 100644
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@ -276,7 +276,9 @@ rpcrdma_conn_upcall(struct rdma_cm_id *id, struct rdma_cm_event *event)
         struct rpcrdma_xprt *xprt = id->context;
         struct rpcrdma_ia *ia = &xprt->rx_ia;
         struct rpcrdma_ep *ep = &xprt->rx_ep;
+#ifdef RPC_DEBUG
         struct sockaddr_in *addr = (struct sockaddr_in *) &ep->rep_remote_addr;
+#endif
         struct ib_qp_attr attr;
         struct ib_qp_init_attr iattr;
         int connstate = 0;
@@ -323,12 +325,11 @@ rpcrdma_conn_upcall(struct rdma_cm_id *id, struct rdma_cm_event *event)
         case RDMA_CM_EVENT_DEVICE_REMOVAL:
                 connstate = -ENODEV;
 connected:
-                dprintk("RPC:       %s: %s: %u.%u.%u.%u:%u"
-                        " (ep 0x%p event 0x%x)\n",
+                dprintk("RPC:       %s: %s: %pI4:%u (ep 0x%p event 0x%x)\n",
                         __func__,
                         (event->event <= 11) ? conn[event->event] :
                                                 "unknown connection error",
-                        NIPQUAD(addr->sin_addr.s_addr),
+                        &addr->sin_addr.s_addr,
                         ntohs(addr->sin_port),
                         ep, event->event);
                 atomic_set(&rpcx_to_rdmax(ep->rep_xprt)->rx_buf.rb_credits, 1);
@@ -348,18 +349,17 @@ connected:
         if (connstate == 1) {
                 int ird = attr.max_dest_rd_atomic;
                 int tird = ep->rep_remote_cma.responder_resources;
-                printk(KERN_INFO "rpcrdma: connection to %u.%u.%u.%u:%u "
+                printk(KERN_INFO "rpcrdma: connection to %pI4:%u "
                         "on %s, memreg %d slots %d ird %d%s\n",
-                        NIPQUAD(addr->sin_addr.s_addr),
+                        &addr->sin_addr.s_addr,
                         ntohs(addr->sin_port),
                         ia->ri_id->device->name,
                         ia->ri_memreg_strategy,
                         xprt->rx_buf.rb_max_requests,
                         ird, ird < 4 && ird < tird / 2 ? " (low!)" : "");
         } else if (connstate < 0) {
-                printk(KERN_INFO "rpcrdma: connection to %u.%u.%u.%u:%u "
-                        "closed (%d)\n",
-                        NIPQUAD(addr->sin_addr.s_addr),
+                printk(KERN_INFO "rpcrdma: connection to %pI4:%u closed (%d)\n",
+                        &addr->sin_addr.s_addr,
                         ntohs(addr->sin_port),
                         connstate);
         }
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 0a50361e3d83..5cbb404c4cdf 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -284,8 +284,7 @@ static void xs_format_ipv4_peer_addresses(struct rpc_xprt *xprt,
 
         buf = kzalloc(20, GFP_KERNEL);
         if (buf) {
-                snprintf(buf, 20, NIPQUAD_FMT,
-                                NIPQUAD(addr->sin_addr.s_addr));
+                snprintf(buf, 20, "%pI4", &addr->sin_addr.s_addr);
         }
         xprt->address_strings[RPC_DISPLAY_ADDR] = buf;
 
@@ -300,8 +299,8 @@ static void xs_format_ipv4_peer_addresses(struct rpc_xprt *xprt,
 
         buf = kzalloc(48, GFP_KERNEL);
         if (buf) {
-                snprintf(buf, 48, "addr="NIPQUAD_FMT" port=%u proto=%s",
-                        NIPQUAD(addr->sin_addr.s_addr),
+                snprintf(buf, 48, "addr=%pI4 port=%u proto=%s",
+                        &addr->sin_addr.s_addr,
                         ntohs(addr->sin_port),
                         protocol);
         }
@@ -323,8 +322,8 @@ static void xs_format_ipv4_peer_addresses(struct rpc_xprt *xprt,
 
         buf = kzalloc(30, GFP_KERNEL);
         if (buf) {
-                snprintf(buf, 30, NIPQUAD_FMT".%u.%u",
-                                NIPQUAD(addr->sin_addr.s_addr),
+                snprintf(buf, 30, "%pI4.%u.%u",
+                                &addr->sin_addr.s_addr,
                                 ntohs(addr->sin_port) >> 8,
                                 ntohs(addr->sin_port) & 0xff);
         }
@@ -342,8 +341,7 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt,
 
         buf = kzalloc(40, GFP_KERNEL);
         if (buf) {
-                snprintf(buf, 40, NIP6_FMT,
-                                NIP6(addr->sin6_addr));
+                snprintf(buf, 40, "%pI6",&addr->sin6_addr);
         }
         xprt->address_strings[RPC_DISPLAY_ADDR] = buf;
 
@@ -358,18 +356,17 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt,
 
         buf = kzalloc(64, GFP_KERNEL);
         if (buf) {
-                snprintf(buf, 64, "addr="NIP6_FMT" port=%u proto=%s",
-                                NIP6(addr->sin6_addr),
+                snprintf(buf, 64, "addr=%pI6 port=%u proto=%s",
+                                &addr->sin6_addr,
                                 ntohs(addr->sin6_port),
                                 protocol);
         }
         xprt->address_strings[RPC_DISPLAY_ALL] = buf;
 
         buf = kzalloc(36, GFP_KERNEL);
-        if (buf) {
-                snprintf(buf, 36, NIP6_SEQFMT,
-                                NIP6(addr->sin6_addr));
-        }
+        if (buf)
+                snprintf(buf, 36, "%pi6", &addr->sin6_addr);
+
         xprt->address_strings[RPC_DISPLAY_HEX_ADDR] = buf;
 
         buf = kzalloc(8, GFP_KERNEL);
@@ -381,10 +378,10 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt,
 
         buf = kzalloc(50, GFP_KERNEL);
         if (buf) {
-                snprintf(buf, 50, NIP6_FMT".%u.%u",
-                                NIP6(addr->sin6_addr),
-                                ntohs(addr->sin6_port) >> 8,
-                                ntohs(addr->sin6_port) & 0xff);
+                snprintf(buf, 50, "%pI6.%u.%u",
+                         &addr->sin6_addr,
+                         ntohs(addr->sin6_port) >> 8,
+                         ntohs(addr->sin6_port) & 0xff);
         }
         xprt->address_strings[RPC_DISPLAY_UNIVERSAL_ADDR] = buf;
 
@@ -1415,8 +1412,8 @@ static int xs_bind4(struct sock_xprt *transport, struct socket *sock)
                 if (port > last)
                         nloop++;
         } while (err == -EADDRINUSE && nloop != 2);
-        dprintk("RPC:       %s "NIPQUAD_FMT":%u: %s (%d)\n",
-                        __func__, NIPQUAD(myaddr.sin_addr),
+        dprintk("RPC:       %s %pI4:%u: %s (%d)\n",
+                        __func__, &myaddr.sin_addr,
                         port, err ? "failed" : "ok", err);
         return err;
 }
@@ -1448,8 +1445,8 @@ static int xs_bind6(struct sock_xprt *transport, struct socket *sock)
                 if (port > last)
                         nloop++;
         } while (err == -EADDRINUSE && nloop != 2);
-        dprintk("RPC:       xs_bind6 "NIP6_FMT":%u: %s (%d)\n",
-                NIP6(myaddr.sin6_addr), port, err ? "failed" : "ok", err);
+        dprintk("RPC:       xs_bind6 %pI6:%u: %s (%d)\n",
+                &myaddr.sin6_addr, port, err ? "failed" : "ok", err);
         return err;
 }