From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Thu, 7 Dec 2006 21:35:17 +0000 (-0500)
Subject: Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
X-Git-Tag: v2.6.20-rc1~34^2~412^2~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=21b4e736922f546e0f1aa7b9d6c442f309a2444a;p=linux-2.6-omap-h63xx.git

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
---

21b4e736922f546e0f1aa7b9d6c442f309a2444a
diff --cc net/sunrpc/xprtsock.c
index 3bb232eb5d9,2fc4a312326..49cabffd7fd
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@@ -1197,8 -1110,9 +1226,9 @@@ static void xs_udp_connect_worker(struc
  		dprintk("RPC:      can't create UDP transport socket (%d).\n", -err);
  		goto out;
  	}
+ 	xs_reclassify_socket(sock);
  
 -	if (xprt->resvport && xs_bindresvport(xprt, sock) < 0) {
 +	if (xprt->resvport && xs_bindresvport(transport, sock) < 0) {
  		sock_release(sock);
  		goto out;
  	}
@@@ -1282,8 -1195,9 +1312,9 @@@ static void xs_tcp_connect_worker(struc
  			dprintk("RPC:      can't create TCP transport socket (%d).\n", -err);
  			goto out;
  		}
+ 		xs_reclassify_socket(sock);
  
 -		if (xprt->resvport && xs_bindresvport(xprt, sock) < 0) {
 +		if (xprt->resvport && xs_bindresvport(transport, sock) < 0) {
  			sock_release(sock);
  			goto out;
  		}