diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index d2ea95b..e9ea394 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -2270,11 +2270,11 @@
 		/* new SMB session uses our srvTcp ref */
 		pSesInfo->server = srvTcp;
 		if (srvTcp->addr.sockAddr6.sin6_family == AF_INET6)
-			sprintf(pSesInfo->serverName, NIP6_FMT,
-				NIP6(srvTcp->addr.sockAddr6.sin6_addr));
+			sprintf(pSesInfo->serverName, "%pI6",
+				&srvTcp->addr.sockAddr6.sin6_addr);
 		else
-			sprintf(pSesInfo->serverName, NIPQUAD_FMT,
-				NIPQUAD(srvTcp->addr.sockAddr.sin_addr.s_addr));
+			sprintf(pSesInfo->serverName, "%pI4",
+				&srvTcp->addr.sockAddr.sin_addr.s_addr);
 
 		write_lock(&cifs_tcp_ses_lock);
 		list_add(&pSesInfo->smb_ses_list, &srvTcp->smb_ses_list);