From: Dotan Barak <dotanb@dev.mellanox.co.il>
Date: Sun, 11 Dec 2011 13:17:24 +0000 (+0200)
Subject: rds: fix compilation warnings
X-Git-Tag: v4.1.12-92~319^2^2~2^2~81
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9064d3a17fea1bd861d9b53940c416bf0053c97d;p=users%2Fjedix%2Flinux-maple.git

rds: fix compilation warnings

Fix the following compilation warnings:
ofed_kernel/net/rds/iw_cm.c: In function rds_iw_qp_event_handler:
ofed_kernel/net/rds/iw_cm.c:162: warning: too many arguments for format
ofed_kernel/net/rds/af_rds.c:384: warning: initialization from incompatible pointer type

Signed-off-by: Dotan Barak <dotanb@dev.mellanox.co.il>
Reviewed-by: Erez Shitrit <erezsh@mellanox.co.il>
---

diff --git a/net/rds/af_rds.c b/net/rds/af_rds.c
index 60acb48fc772..f019144269c6 100644
--- a/net/rds/af_rds.c
+++ b/net/rds/af_rds.c
@@ -254,7 +254,7 @@ static int rds_cong_monitor(struct rds_sock *rs, char __user *optval,
 }
 
 static int rds_setsockopt(struct socket *sock, int level, int optname,
-			  char __user *optval, int optlen)
+			  char __user *optval, unsigned int optlen)
 {
 	struct rds_sock *rs = rds_sk_to_rs(sock->sk);
 	int ret;
diff --git a/net/rds/iw_cm.c b/net/rds/iw_cm.c
index b2666320d6f5..6bc638fd252c 100644
--- a/net/rds/iw_cm.c
+++ b/net/rds/iw_cm.c
@@ -157,7 +157,7 @@ static void rds_iw_qp_event_handler(struct ib_event *event, void *data)
 	case IB_EVENT_QP_FATAL:
 	default:
 		rdsdebug("Fatal QP Event %u "
-			"- connection $pI4->%pI4, reconnecting\n",
+			"- connection %pI4->%pI4, reconnecting\n",
 			event->event, &conn->c_laddr,
 			&conn->c_faddr);
 		rds_conn_drop(conn);