From: Roland Dreier <rolandd@cisco.com>
Date: Fri, 11 Sep 2009 04:19:45 +0000 (-0700)
Subject: Merge branch 'mad' into for-linus
X-Git-Tag: v2.6.32-rc1~736^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=73f526da0260db5376951373c267596993dc13a8;p=profile%2Fcommon%2Fkernel-common.git

Merge branch 'mad' into for-linus

Conflicts:
	drivers/infiniband/core/mad.c
---

73f526da0260db5376951373c267596993dc13a8
diff --cc drivers/infiniband/core/mad.c
index 5cef8f8,0f7da24..7522008
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@@ -2983,6 -2993,14 +2992,12 @@@ static int __init ib_mad_init_module(vo
  {
  	int ret;
  
+ 	mad_recvq_size = min(mad_recvq_size, IB_MAD_QP_MAX_SIZE);
+ 	mad_recvq_size = max(mad_recvq_size, IB_MAD_QP_MIN_SIZE);
+ 
+ 	mad_sendq_size = min(mad_sendq_size, IB_MAD_QP_MAX_SIZE);
+ 	mad_sendq_size = max(mad_sendq_size, IB_MAD_QP_MIN_SIZE);
+ 
 -	spin_lock_init(&ib_mad_port_list_lock);
 -
  	ib_mad_cache = kmem_cache_create("ib_mad",
  					 sizeof(struct ib_mad_private),
  					 0,