configure/makefile: Rename CONFIG_INFINIBAND_RXE -> CONFIG_RDMA_RXE to match upstream

Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>

diff --git a/configure b/configure
index 59131197dab39c17454077363d8ffd4ef66aeb8d..548e6177dd34a695f64eb2da9c2769ce816b7095 100755 (executable)
--- a/configure
+++ b/configure
@@ -573,14 +573,14 @@ main()
                         --with-qib-mod)
                             CONFIG_INFINIBAND_QIB="m"
                             CONFIG_INFINIBAND_RDMAVT="m"
-                            CONFIG_INFINIBAND_RXE="m"
+                            CONFIG_RDMA_RXE="m"
                             add_conf "# Load QIB" "QIB_LOAD=yes"
                             add_conf "# QIB QME BP VER" "QIB_QME_BPVER=1"
                         ;;
                         --without-qib-mod)
                             CONFIG_INFINIBAND_QIB=
                             CONFIG_INFINIBAND_RDMAVT=
-                            CONFIG_INFINIBAND_RXE=
+                            CONFIG_RDMA_RXE=
                         ;;
                         --with-iser-mod)
                             CONFIG_INFINIBAND_ISER="m"
@@ -861,7 +861,7 @@ if [ $ARCH != "x86_64" ]; then
     CONFIG_INFINIBAND_IPATH=
     CONFIG_INFINIBAND_QIB=
     CONFIG_INFINIBAND_RDMAVT=
-    CONFIG_INFINIBAND_RXE=
+    CONFIG_RDMA_RXE=
     CONFIG_INFINIBAND_VMWARE_PVRDMA=
 fi
 
@@ -936,7 +936,7 @@ CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=${CONFIG_INFINIBAND_IPOIB_DEBUG_DATA:-''}
 CONFIG_INFINIBAND_IPATH=${CONFIG_INFINIBAND_IPATH:-''}
 CONFIG_INFINIBAND_QIB=${CONFIG_INFINIBAND_QIB:-''}
 CONFIG_INFINIBAND_RDMAVT=${CONFIG_INFINIBAND_RDMAVT:-''}
-CONFIG_INFINIBAND_RXE=${CONFIG_INFINIBAND_RXE:-''}
+CONFIG_RDMA_RXE=${CONFIG_RDMA_RXE:-''}
 CONFIG_INFINIBAND_MTHCA_DEBUG=${CONFIG_INFINIBAND_MTHCA_DEBUG:-''}
 CONFIG_INFINIBAND_QLGC_VNIC_STATS=${CONFIG_INFINIBAND_QLGC_VNIC_STATS:-''}
 CONFIG_INFINIBAND_CXGB3_DEBUG=${CONFIG_INFINIBAND_CXGB3_DEBUG:-''}
@@ -1091,7 +1091,7 @@ CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=${CONFIG_INFINIBAND_IPOIB_DEBUG_DATA}
 CONFIG_INFINIBAND_IPATH=${CONFIG_INFINIBAND_IPATH}
 CONFIG_INFINIBAND_QIB=${CONFIG_INFINIBAND_QIB}
 CONFIG_INFINIBAND_RDMAVT=${CONFIG_INFINIBAND_RDMAVT}
-CONFIG_INFINIBAND_RXE=${CONFIG_INFINIBAND_RXE}
+CONFIG_RDMA_RXE=${CONFIG_RDMA_RXE}
 CONFIG_INFINIBAND_MTHCA_DEBUG=${CONFIG_INFINIBAND_MTHCA_DEBUG}
 CONFIG_INFINIBAND_QLGC_VNIC_STATS=${CONFIG_INFINIBAND_QLGC_VNIC_STATS}
 CONFIG_INFINIBAND_CXGB3_DEBUG=${CONFIG_INFINIBAND_CXGB3_DEBUG}
@@ -1314,11 +1314,11 @@ fi
 if [ "X${CONFIG_INFINIBAND_QIB}" == "Xm" ]; then
         DEFINE_INFINIBAND_QIB="#undef CONFIG_INFINIBAND_QIB\n#define CONFIG_INFINIBAND_QIB 1"
         DEFINE_INFINIBAND_RDMAVT="#undef CONFIG_INFINIBAND_RDMAVT\n#define CONFIG_INFINIBAND_RDMAVT 1"
-        DEFINE_INFINIBAND_RXE="#undef CONFIG_INFINIBAND_RXE\n#define CONFIG_INFINIBAND_RXE 1"
+        DEFINE_RDMA_RXE="#undef CONFIG_RDMA_RXE\n#define CONFIG_RDMA_RXE 1"
 else
         DEFINE_INFINIBAND_QIB="#undef CONFIG_INFINIBAND_QIB"
         DEFINE_INFINIBAND_RDMAVT="#undef CONFIG_INFINIBAND_RDMAVT"
-        DEFINE_INFINIBAND_RXE="#undef CONFIG_INFINIBAND_RXE"
+        DEFINE_RDMA_RXE="#undef CONFIG_RDMA_RXE"
 fi
 if [ "X${CONFIG_INFINIBAND_MTHCA_DEBUG}" == "Xy" ]; then
         DEFINE_INFINIBAND_MTHCA_DEBUG="#undef CONFIG_INFINIBAND_MTHCA_DEBUG\n#define CONFIG_INFINIBAND_MTHCA_DEBUG 1"
@@ -1559,7 +1559,7 @@ $(echo -e "${DEFINE_INFINIBAND_IPOIB_DEBUG_DATA}" | grep -v undef)
 $(echo -e "${DEFINE_INFINIBAND_IPATH}" | grep -v undef)
 $(echo -e "${DEFINE_INFINIBAND_QIB}" | grep -v undef)
 $(echo -e "${DEFINE_INFINIBAND_RDMAVT}" | grep -v undef)
-$(echo -e "${DEFINE_INFINIBAND_RXE}" | grep -v undef)
+$(echo -e "${DEFINE_RDMA_RXE}" | grep -v undef)
 $(echo -e "${DEFINE_INFINIBAND_MTHCA_DEBUG}" | grep -v undef)
 $(echo -e "${DEFINE_INFINIBAND_MADEYE}" | grep -v undef)
 $(echo -e "${DEFINE_INFINIBAND_AMSO1100}" | grep -v undef)
@@ -1648,7 +1648,7 @@ $(echo -e "${DEFINE_INFINIBAND_QEDR}" | grep -v undef)
 #undef CONFIG_INFINIBAND_IPATH
 #undef CONFIG_INFINIBAND_QIB
 #undef CONFIG_INFINIBAND_RDMAVT
-#undef CONFIG_INFINIBAND_RXE
+#undef CONFIG_RDMA_RXE
 #undef CONFIG_INFINIBAND_MTHCA_DEBUG
 #undef CONFIG_INFINIBAND_AMSO1100
 #undef CONFIG_MLX4_EN_DCB
@@ -1730,7 +1730,7 @@ $(echo -e "${DEFINE_INFINIBAND_IPOIB_DEBUG_DATA}")
 $(echo -e "${DEFINE_INFINIBAND_IPATH}")
 $(echo -e "${DEFINE_INFINIBAND_QIB}")
 $(echo -e "${DEFINE_INFINIBAND_RDMAVT}")
-$(echo -e "${DEFINE_INFINIBAND_RXE}")
+$(echo -e "${DEFINE_RDMA_RXE}")
 $(echo -e "${DEFINE_INFINIBAND_MTHCA_DEBUG}")
 $(echo -e "${DEFINE_INFINIBAND_MADEYE}")
 $(echo -e "${DEFINE_INFINIBAND_AMSO1100}")

diff --git a/makefile b/makefile
index 9b1668099189dd1bfb732d3c16912ac391ba330c..0f6d5068941d9d6e8b4635a89121445616a6ed35 100644 (file)
--- a/makefile
+++ b/makefile
@@ -107,7 +107,7 @@ kernel: $(COMPAT_CONFIG) $(COMPAT_AUTOCONF)
                CONFIG_INFINIBAND_IPATH=$(CONFIG_INFINIBAND_IPATH) \
                CONFIG_INFINIBAND_QIB=$(CONFIG_INFINIBAND_QIB) \
                CONFIG_INFINIBAND_RDMAVT=$(CONFIG_INFINIBAND_RDMAVT) \
-               CONFIG_INFINIBAND_RXE=$(CONFIG_INFINIBAND_RXE) \
+               CONFIG_RDMA_RXE=$(CONFIG_RDMA_RXE) \
                CONFIG_INFINIBAND_MTHCA_DEBUG=$(CONFIG_INFINIBAND_MTHCA_DEBUG) \
                CONFIG_INFINIBAND_MADEYE=$(CONFIG_INFINIBAND_MADEYE) \
                CONFIG_INFINIBAND_QLGC_VNIC=$(CONFIG_INFINIBAND_QLGC_VNIC) \