From: Michael S. Tsirkin <mst@mellanox.co.il>
Date: Thu, 17 Aug 2006 14:26:00 +0000 (+0300)
Subject: IB/sdp: Use inet_sk for portability.
X-Git-Tag: v4.1.12-92~264^2~5^2~389
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e4c5ea245a561cb34dfe3a611200f1bfd90d0951;p=users%2Fjedix%2Flinux-maple.git

IB/sdp: Use inet_sk for portability.
---

diff --git a/drivers/infiniband/ulp/sdp/sdp_cma.c b/drivers/infiniband/ulp/sdp/sdp_cma.c
index b20e1ce03ca1c..ef64c717630e2 100644
--- a/drivers/infiniband/ulp/sdp/sdp_cma.c
+++ b/drivers/infiniband/ulp/sdp/sdp_cma.c
@@ -372,10 +372,8 @@ int sdp_cma_handler(struct rdma_cm_id *id, struct rdma_cm_event *event)
 		hh.localrcvsz = hh.desremrcvsz = htonl(SDP_MAX_SEND_SKB_FRAGS *
 			PAGE_SIZE + sizeof(struct sdp_bsdh));
 		hh.max_adverts = 0x1;
-
-		sdp_sk(sk)->isk.rcv_saddr = ((struct sockaddr_in *)&id->route.addr.src_addr)->sin_addr.s_addr;
-		sdp_sk(sk)->isk.saddr = sdp_sk(sk)->isk.rcv_saddr;
-
+		inet_sk(sk)->saddr = inet_sk(sk)->rcv_saddr =
+			((struct sockaddr_in *)&id->route.addr.src_addr)->sin_addr.s_addr;
 		memset(&conn_param, 0, sizeof conn_param);
 		conn_param.private_data_len = sizeof hh;
 		conn_param.private_data = &hh;
@@ -440,8 +438,8 @@ int sdp_cma_handler(struct rdma_cm_id *id, struct rdma_cm_event *event)
 		break;
 	case RDMA_CM_EVENT_ESTABLISHED:
 		sdp_dbg(sk, "RDMA_CM_EVENT_ESTABLISHED\n");
-		sdp_sk(sk)->isk.rcv_saddr = ((struct sockaddr_in *)&id->route.addr.src_addr)->sin_addr.s_addr;
-		sdp_sk(sk)->isk.saddr = sdp_sk(sk)->isk.rcv_saddr;
+		inet_sk(sk)->saddr = inet_sk(sk)->rcv_saddr =
+			((struct sockaddr_in *)&id->route.addr.src_addr)->sin_addr.s_addr;
 		rc = sdp_connected_handler(sk, event);
 		break;
 	case RDMA_CM_EVENT_DISCONNECTED: