From: Amir Vadai <amirv@mellanox.co.il>
Date: Sun, 3 Aug 2008 08:20:06 +0000 (+0300)
Subject: support for 2.6.27 + backports
X-Git-Tag: v4.1.12-92~264^2~5^2~315
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=097eb3a2802b003100d93669089a3ca98bc1f0cb;p=users%2Fjedix%2Flinux-maple.git

support for 2.6.27 + backports

Signed-off-by: Amir Vadai <amirv@mellanox.co.il>
---

diff --git a/drivers/infiniband/ulp/sdp/sdp.h b/drivers/infiniband/ulp/sdp/sdp.h
index c071e54d0293a..bcf21254ab2d0 100644
--- a/drivers/infiniband/ulp/sdp/sdp.h
+++ b/drivers/infiniband/ulp/sdp/sdp.h
@@ -334,7 +334,7 @@ static inline struct sk_buff *sdp_stream_alloc_skb(struct sock *sk, int size, gf
 		}
 		__kfree_skb(skb);
 	} else {
-		sk->sk_prot->enter_memory_pressure();
+		sk->sk_prot->enter_memory_pressure(sk);
 		sk_stream_moderate_sndbuf(sk);
 	}
 	return NULL;
diff --git a/drivers/infiniband/ulp/sdp/sdp_cma.c b/drivers/infiniband/ulp/sdp/sdp_cma.c
index a153bd8045ac4..6126902689ac4 100644
--- a/drivers/infiniband/ulp/sdp/sdp_cma.c
+++ b/drivers/infiniband/ulp/sdp/sdp_cma.c
@@ -31,7 +31,6 @@
  *
  * $Id$
  */
-#include <asm/semaphore.h>
 #include <linux/device.h>
 #include <linux/in.h>
 #include <linux/err.h>
diff --git a/drivers/infiniband/ulp/sdp/sdp_main.c b/drivers/infiniband/ulp/sdp/sdp_main.c
index de14ab685ad9e..e90e6cfbb7d7c 100644
--- a/drivers/infiniband/ulp/sdp/sdp_main.c
+++ b/drivers/infiniband/ulp/sdp/sdp_main.c
@@ -523,7 +523,7 @@ static void sdp_close(struct sock *sk, long timeout)
 	if (data_was_unread ||
 		(sock_flag(sk, SOCK_LINGER) && !sk->sk_lingertime)) {
 		/* Unread data was tossed, zap the connection. */
-		NET_INC_STATS_USER(LINUX_MIB_TCPABORTONCLOSE);
+		NET_INC_STATS_USER(sock_net(sk), LINUX_MIB_TCPABORTONCLOSE);
 		sdp_exch_state(sk, TCPF_CLOSE_WAIT | TCPF_ESTABLISHED,
 			       TCP_TIME_WAIT);
 
@@ -1846,7 +1846,7 @@ static int sdp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 			if (offset < skb->len)
 				goto found_ok_skb;
 
-			BUG_TRAP(flags & MSG_PEEK);
+			WARN_ON(!(flags & MSG_PEEK));
 			skb = skb->next;
 		} while (skb != (struct sk_buff *)&sk->sk_receive_queue);
 
@@ -2083,9 +2083,9 @@ static unsigned int sdp_poll(struct file *file, struct socket *socket,
 	return mask;
 }
 
-static void sdp_enter_memory_pressure(void)
+static void sdp_enter_memory_pressure(struct sock *sk)
 {
-	sdp_dbg(NULL, "%s\n", __func__);
+	sdp_dbg(sk, "%s\n", __func__);
 }
 
 void sdp_urg(struct sdp_sock *ssk, struct sk_buff *skb)