From cc3a1e7b2667afb67db05b768d1ee61b863cd1c6 Mon Sep 17 00:00:00 2001 From: Chuck Lever Date: Wed, 20 Oct 2010 11:52:51 -0400 Subject: [PATCH] --- yaml --- r: 217282 b: refs/heads/master c: 4232e8634ad82c5a53389e4016de15a8b15c09c3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/sunrpc/xprtsock.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7a5a0125c643..424981cc0eb4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a25e758c5fa1137e1bbc440194e55f7c59177145 +refs/heads/master: 4232e8634ad82c5a53389e4016de15a8b15c09c3 diff --git a/trunk/net/sunrpc/xprtsock.c b/trunk/net/sunrpc/xprtsock.c index 79155650b7b9..b58eef76a518 100644 --- a/trunk/net/sunrpc/xprtsock.c +++ b/trunk/net/sunrpc/xprtsock.c @@ -1558,7 +1558,7 @@ static int xs_bind(struct sock_xprt *transport, struct socket *sock) nloop++; } while (err == -EADDRINUSE && nloop != 2); - if (myaddr.ss_family == PF_INET) + if (myaddr.ss_family == AF_INET) dprintk("RPC: %s %pI4:%u: %s (%d)\n", __func__, &((struct sockaddr_in *)&myaddr)->sin_addr, port, err ? "failed" : "ok", err); @@ -1594,10 +1594,14 @@ static inline void xs_reclassify_socket6(struct socket *sock) static inline void xs_reclassify_socket(int family, struct socket *sock) { - if (family == PF_INET) + switch (family) { + case AF_INET: xs_reclassify_socket4(sock); - else + break; + case AF_INET6: xs_reclassify_socket6(sock); + break; + } } #else static inline void xs_reclassify_socket4(struct socket *sock)