X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=net%2Fsunrpc%2Fxprtsock.c;h=83c73c4d017ad9ec91b4f1895344749c51b9839b;hb=23ac6581702ac6d029643328a7e6ea3baf834c5e;hp=8a721867b60135e3c4f76a9631884db98ea109a7;hpb=0d90ba1cd416525c4825c111db862d8b15a02e9b;p=safe%2Fjmp%2Flinux-2.6

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 8a72186..83c73c4 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -928,7 +928,7 @@ static void xs_udp_data_ready(struct sock *sk, int len)
 	UDPX_INC_STATS_BH(sk, UDP_MIB_INDATAGRAMS);
 
 	/* Something worked... */
-	dst_confirm(skb->dst);
+	dst_confirm(skb_dst(skb));
 
 	xprt_adjust_cwnd(task, copied);
 	xprt_update_rtt(task);
@@ -1965,6 +1965,7 @@ static void xs_tcp_setup_socket(struct rpc_xprt *xprt,
 		 */
 		set_bit(XPRT_CONNECTION_CLOSE, &xprt->state);
 		xprt_force_disconnect(xprt);
+		break;
 	case -ECONNREFUSED:
 	case -ECONNRESET:
 	case -ENETUNREACH: