From 40b585d111df246cdd95a767f553807110746684 Mon Sep 17 00:00:00 2001
From: Andy Grover <andy.grover@oracle.com>
Date: Fri, 17 Jul 2009 13:13:30 +0000
Subject: [PATCH] --- yaml --- r: 159003 b: refs/heads/master c:
 68cb01c1ba312add7c7cc7da1bbe98b3071904d1 h: refs/heads/master i:   159001:
 d7ffd1968c357acbb9c76374de538391fb8b2030   158999:
 8e43ea9dc945696d4bf9473d627a03d6d0dcf27c v: v3

---
 [refs]                    |  2 +-
 trunk/net/rds/ib_sysctl.c | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cd8815f62b50..5953c8aa5d50 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e11d912a7dd4dfe388f38ba3080a6d067a57b23d
+refs/heads/master: 68cb01c1ba312add7c7cc7da1bbe98b3071904d1
diff --git a/trunk/net/rds/ib_sysctl.c b/trunk/net/rds/ib_sysctl.c
index d87830db93a0..84b5ffcb280f 100644
--- a/trunk/net/rds/ib_sysctl.c
+++ b/trunk/net/rds/ib_sysctl.c
@@ -53,7 +53,17 @@ unsigned long rds_ib_sysctl_max_unsig_bytes = (16 << 20);
 static unsigned long rds_ib_sysctl_max_unsig_bytes_min = 1;
 static unsigned long rds_ib_sysctl_max_unsig_bytes_max = ~0UL;
 
-unsigned int rds_ib_sysctl_flow_control = 1;
+/*
+ * This sysctl does nothing.
+ *
+ * Backwards compatibility with RDS 3.0 wire protocol
+ * disables initial FC credit exchange.
+ * If it's ever possible to drop 3.0 support,
+ * setting this to 1 and moving init/refill of send/recv
+ * rings from ib_cm_connect_complete() back into ib_setup_qp()
+ * will cause credits to be added before protocol negotiation.
+ */
+unsigned int rds_ib_sysctl_flow_control = 0;
 
 ctl_table rds_ib_sysctl_table[] = {
 	{