From e5f7f4952ef4212e590ccd2db7f6cb4d9be7022e Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Mon, 4 Oct 2010 16:51:56 +0400 Subject: [PATCH] --- yaml --- r: 217265 b: refs/heads/master c: baaf4e487a9c42b345bde14698fd566f864c9287 h: refs/heads/master i: 217263: f68fff1221359f722ad02d052f9e63cd7b914ad1 v: v3 --- [refs] | 2 +- trunk/net/sunrpc/xprtsock.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bc27f735e12e..eee661892d5c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d4ec932972a0dd5486c59909e62dc62105d065c +refs/heads/master: baaf4e487a9c42b345bde14698fd566f864c9287 diff --git a/trunk/net/sunrpc/xprtsock.c b/trunk/net/sunrpc/xprtsock.c index 304e2de2c70c..024a64443203 100644 --- a/trunk/net/sunrpc/xprtsock.c +++ b/trunk/net/sunrpc/xprtsock.c @@ -1524,7 +1524,7 @@ static unsigned short xs_get_srcport(struct sock_xprt *transport) return port; } -static unsigned short xs_next_srcport(struct sock_xprt *transport, struct socket *sock, unsigned short port) +static unsigned short xs_next_srcport(struct sock_xprt *transport, unsigned short port) { if (transport->srcport != 0) transport->srcport = 0; @@ -1558,7 +1558,7 @@ static int xs_bind4(struct sock_xprt *transport, struct socket *sock) break; } last = port; - port = xs_next_srcport(transport, sock, port); + port = xs_next_srcport(transport, port); if (port > last) nloop++; } while (err == -EADDRINUSE && nloop != 2); @@ -1591,7 +1591,7 @@ static int xs_bind6(struct sock_xprt *transport, struct socket *sock) break; } last = port; - port = xs_next_srcport(transport, sock, port); + port = xs_next_srcport(transport, port); if (port > last) nloop++; } while (err == -EADDRINUSE && nloop != 2);