From: Eldad Zinger <eldadz@mellanox.co.il>
Date: Tue, 5 Oct 2010 11:53:34 +0000 (+0200)
Subject: sdp: cosmetics & add/remove warning messages
X-Git-Tag: v4.1.12-92~264^2~5^2~96
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6d622eb2d94c98d65e8b7cca230d8d151b1679df;p=users%2Fjedix%2Flinux-maple.git

sdp: cosmetics & add/remove warning messages

Signed-off-by: Eldad Zinger <eldadz@mellanox.co.il>
---

diff --git a/drivers/infiniband/ulp/sdp/sdp_cma.c b/drivers/infiniband/ulp/sdp/sdp_cma.c
index b255b4bd6e746..564cb78e4d70d 100644
--- a/drivers/infiniband/ulp/sdp/sdp_cma.c
+++ b/drivers/infiniband/ulp/sdp/sdp_cma.c
@@ -53,6 +53,8 @@ SDP_MODPARAM_SINT(sdp_link_layer_ib_only, 1, "Support only link layer of "
 
 static void sdp_qp_event_handler(struct ib_event *event, void *data)
 {
+	sdp_warn(NULL, "unexpected invocation: event: %d, data=%p\n",
+			event->event, data);
 }
 
 static int sdp_get_max_dev_sge(struct ib_device *dev)
@@ -371,7 +373,6 @@ int sdp_cma_handler(struct rdma_cm_id *id, struct rdma_cm_event *event)
 		hh.bsdh.bufs = htons(rx_ring_posted(sdp_sk(sk)));
 		hh.localrcvsz = hh.desremrcvsz = htonl(sdp_sk(sk)->recv_frags *
 				PAGE_SIZE + sizeof(struct sdp_bsdh));
-		hh.max_adverts = 0x1;
 		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);
diff --git a/drivers/infiniband/ulp/sdp/sdp_main.c b/drivers/infiniband/ulp/sdp/sdp_main.c
index 96628b65e6948..2a2afea1e5548 100644
--- a/drivers/infiniband/ulp/sdp/sdp_main.c
+++ b/drivers/infiniband/ulp/sdp/sdp_main.c
@@ -783,11 +783,6 @@ static int sdp_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
 		NIPQUAD(((struct sockaddr_in *)uaddr)->sin_addr.s_addr),
 		ntohs(((struct sockaddr_in *)uaddr)->sin_port));
 
-	if (!ssk->id) {
-		printk("??? ssk->id == NULL. Ohh\n");
-		return -EINVAL;
-	}
-
 	rc = rdma_resolve_addr(ssk->id, (struct sockaddr *)&src_addr,
 			       uaddr, SDP_RESOLVE_TIMEOUT);
 	if (rc) {
diff --git a/drivers/infiniband/ulp/sdp/sdp_rx.c b/drivers/infiniband/ulp/sdp/sdp_rx.c
index f7db62cc7086e..042fcdb122269 100644
--- a/drivers/infiniband/ulp/sdp/sdp_rx.c
+++ b/drivers/infiniband/ulp/sdp/sdp_rx.c
@@ -895,7 +895,7 @@ int sdp_rx_ring_create(struct sdp_sock *ssk, struct ib_device *device)
 	atomic_set(&ssk->rx_ring.head, 1);
 	atomic_set(&ssk->rx_ring.tail, 1);
 
-	ssk->rx_ring.buffer = kmalloc(
+	ssk->rx_ring.buffer = kzalloc(
 			sizeof *ssk->rx_ring.buffer * SDP_RX_SIZE, GFP_KERNEL);
 	if (!ssk->rx_ring.buffer) {
 		sdp_warn(&ssk->isk.sk,
@@ -905,8 +905,6 @@ int sdp_rx_ring_create(struct sdp_sock *ssk, struct ib_device *device)
 		return -ENOMEM;
 	}
 
-	memset(ssk->rx_ring.buffer, 0, sizeof *ssk->rx_ring.buffer * SDP_RX_SIZE);
-
 	rx_cq = ib_create_cq(device, sdp_rx_irq, sdp_rx_cq_event_handler,
 			  &ssk->isk.sk, SDP_RX_SIZE, IB_CQ_VECTOR_LEAST_ATTACHED);
 
@@ -916,7 +914,7 @@ int sdp_rx_ring_create(struct sdp_sock *ssk, struct ib_device *device)
 		goto err_cq;
 	}
 
-	sdp_sk(&ssk->isk.sk)->rx_ring.cq = rx_cq;
+	ssk->rx_ring.cq = rx_cq;
 
 	INIT_WORK(&ssk->rx_comp_work, sdp_rx_comp_work);
 	setup_timer(&ssk->rx_ring.cq_arm_timer, sdp_arm_cq_timer,
diff --git a/drivers/infiniband/ulp/sdp/sdp_tx.c b/drivers/infiniband/ulp/sdp/sdp_tx.c
index dac171bf04289..a34211b2dd6c9 100644
--- a/drivers/infiniband/ulp/sdp/sdp_tx.c
+++ b/drivers/infiniband/ulp/sdp/sdp_tx.c
@@ -498,7 +498,7 @@ int sdp_tx_ring_create(struct sdp_sock *ssk, struct ib_device *device)
 		goto err_cq;
 	}
 
-	sdp_sk(&ssk->isk.sk)->tx_ring.cq = tx_cq;
+	ssk->tx_ring.cq = tx_cq;
 
 	setup_timer(&ssk->tx_ring.timer, sdp_poll_tx_timeout,
 			(unsigned long)ssk);