Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6-omap-h63xx.git] / fs / cifs / cifs_spnego.c

diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c
index 0ab2fb5afef12a78a9ae2fdd0e79af761133468b..3fd3a9df043a6eee77c276563300be4c5ed390a7 100644 (file)
--- a/fs/cifs/cifs_spnego.c
+++ b/fs/cifs/cifs_spnego.c
@@ -121,11 +121,9 @@ cifs_get_spnego_key(struct cifsSesInfo *sesInfo)
 
        /* add the server address */
        if (server->addr.sockAddr.sin_family == AF_INET)
-               sprintf(dp, "ip4=" NIPQUAD_FMT,
-                       NIPQUAD(server->addr.sockAddr.sin_addr));
+               sprintf(dp, "ip4=%pI4", &server->addr.sockAddr.sin_addr);
        else if (server->addr.sockAddr.sin_family == AF_INET6)
-               sprintf(dp, "ip6=" NIP6_SEQFMT,
-                       NIP6(server->addr.sockAddr6.sin6_addr));
+               sprintf(dp, "ip6=%pi6", &server->addr.sockAddr6.sin6_addr);
        else
                goto out;