diff options
author | David Woodhouse <dwmw2@infradead.org> | 2007-08-01 06:23:57 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-01 06:23:57 -0400 |
commit | 440fdb53b4ae58602711b5b8c3a139ace2404dbb (patch) | |
tree | c6fb88d6ad537ec53aeecadc75a61ab6147d4c9c /net/sunrpc/svcsock.c | |
parent | 8b2b403ce0f1a816b7a6a4f47c8798003b26c07a (diff) | |
parent | 8d4fbcfbe0a4bfc73e7f0297c59ae514e1f1436f (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/sunrpc/svcsock.c')
-rw-r--r-- | net/sunrpc/svcsock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index 64b9b8c743c4..12ff5da8160e 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c | |||
@@ -131,13 +131,13 @@ static char *__svc_print_addr(struct sockaddr *addr, char *buf, size_t len) | |||
131 | case AF_INET: | 131 | case AF_INET: |
132 | snprintf(buf, len, "%u.%u.%u.%u, port=%u", | 132 | snprintf(buf, len, "%u.%u.%u.%u, port=%u", |
133 | NIPQUAD(((struct sockaddr_in *) addr)->sin_addr), | 133 | NIPQUAD(((struct sockaddr_in *) addr)->sin_addr), |
134 | htons(((struct sockaddr_in *) addr)->sin_port)); | 134 | ntohs(((struct sockaddr_in *) addr)->sin_port)); |
135 | break; | 135 | break; |
136 | 136 | ||
137 | case AF_INET6: | 137 | case AF_INET6: |
138 | snprintf(buf, len, "%x:%x:%x:%x:%x:%x:%x:%x, port=%u", | 138 | snprintf(buf, len, "%x:%x:%x:%x:%x:%x:%x:%x, port=%u", |
139 | NIP6(((struct sockaddr_in6 *) addr)->sin6_addr), | 139 | NIP6(((struct sockaddr_in6 *) addr)->sin6_addr), |
140 | htons(((struct sockaddr_in6 *) addr)->sin6_port)); | 140 | ntohs(((struct sockaddr_in6 *) addr)->sin6_port)); |
141 | break; | 141 | break; |
142 | 142 | ||
143 | default: | 143 | default: |