compat-rdma: Add i40iw and i40e to the build scripts

Signed-off-by: Tatyana Nikolova <tatyana.e.nikolova@intel.com>

diff --git a/Makefile b/Makefile
index 031ead0de2ee1e13bd9f3b4b0e5afad7b58b38b5..b6e39e6aa30c872714173c535950947edef69d42 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ obj-$(CONFIG_CHELSIO_T4)        += drivers/net/ethernet/chelsio/cxgb4/
 obj-$(CONFIG_MLX4_CORE)         += drivers/net/ethernet/mellanox/mlx4/
 obj-$(CONFIG_MLX5_CORE)         += drivers/net/ethernet/mellanox/mlx5/core/
 obj-$(CONFIG_BE2NET)            += drivers/net/ethernet/emulex/benet/
+obj-$(CONFIG_I40E)              += drivers/net/ethernet/intel/i40e/
 obj-$(CONFIG_RDS)               += net/rds/
 obj-$(CONFIG_SUNRPC_XPRT_RDMA)  += net/sunrpc/xprtrdma/
 obj-$(CONFIG_SCSI_SRP_ATTRS)    += drivers/scsi/

diff --git a/Module.supported b/Module.supported
index 3ae04b7a66239067b1083b372858d31427864d78..3ce3b6a366d01c9fe86d6da6f71aed123d34b4d4 100644 (file)
--- a/Module.supported
+++ b/Module.supported
@@ -41,4 +41,6 @@ ib_iser.ko external
 ib_ipoib.ko external
 ocrdma.ko external
 be2net.ko external
+i40iw.ko external
+i40e.ko external
 compat.ko external

diff --git a/configure b/configure
index 6aaa94cd2cb4ec45281dbab9afe1c3e33ef9578a..2e3bcf4e3be5f0b87299bdc1e66c8557b91f18f1 100755 (executable)
--- a/configure
+++ b/configure
@@ -157,6 +157,9 @@ Usage:  `basename $0` [options]
     --with-cxgb4-mod    make CONFIG_INFINIBAND_CXGB4=m [no]
     --without-cxgb4-mod    [yes]
 
+    --with-i40iw-mod    make CONFIG_INFINIBAND_I40IW=m [no]
+    --without-i40iw-mod    [yes]
+
     --with-nes-mod    make CONFIG_INFINIBAND_NES=m [no]
     --without-nes-mod    [yes]
 
@@ -670,6 +673,15 @@ main()
                         --without-cxgb4i-mod)
                             CONFIG_SCSI_CXGB4_ISCSI=
                         ;;
+                        --with-i40iw-mod)
+                            CONFIG_INFINIBAND_I40IW="m"
+                            CONFIG_I40E="m"
+                            add_conf "# Load I40IW modules" "I40IW_LOAD=yes"
+                        ;;
+                        --without-i40iw-mod)
+                            CONFIG_INFINIBAND_I40IW=
+                            CONFIG_I40E=
+                        ;;
                         --with-nes-mod)
                             CONFIG_INFINIBAND_NES="m"
                             add_conf "# Load NES modules" "NES_LOAD=yes"
@@ -849,6 +861,8 @@ CONFIG_INFINIBAND_CXGB4=${CONFIG_INFINIBAND_CXGB4:-''}
 CONFIG_CHELSIO_T4=${CONFIG_CHELSIO_T4:-''}
 CONFIG_SCSI_CXGB3_ISCSI=${CONFIG_SCSI_CXGB3_ISCSI:-''}
 CONFIG_SCSI_CXGB4_ISCSI=${CONFIG_SCSI_CXGB4_ISCSI:-''}
+CONFIG_INFINIBAND_I40IW=${CONFIG_INFINIBAND_I40IW:-''}
+CONFIG_I40E=${CONFIG_I40E:-''}
 CONFIG_INFINIBAND_NES=${CONFIG_INFINIBAND_NES:-''}
 CONFIG_INFINIBAND_OCRDMA=${CONFIG_INFINIBAND_OCRDMA:-''}
 CONFIG_BE2NET=${CONFIG_BE2NET:-''}
@@ -984,6 +998,8 @@ CONFIG_INFINIBAND_CXGB4=${CONFIG_INFINIBAND_CXGB4}
 CONFIG_CHELSIO_T4=${CONFIG_CHELSIO_T4}
 CONFIG_SCSI_CXGB3_ISCSI=${CONFIG_SCSI_CXGB3_ISCSI}
 CONFIG_SCSI_CXGB4_ISCSI=${CONFIG_SCSI_CXGB4_ISCSI}
+CONFIG_INFINIBAND_I40IW=${CONFIG_INFINIBAND_I40IW}
+CONFIG_I40E=${CONFIG_I40E}
 CONFIG_INFINIBAND_NES=${CONFIG_INFINIBAND_NES}
 CONFIG_INFINIBAND_OCRDMA=${CONFIG_INFINIBAND_OCRDMA}
 CONFIG_BE2NET=${CONFIG_BE2NET}
@@ -1271,6 +1287,16 @@ if [ "X${CONFIG_SCSI_CXGB4_ISCSI}" == "Xm" ]; then
 else
         DEFINE_SCSI_CXGB4_ISCSI="#undef CONFIG_SCSI_CXGB4_ISCSI"
 fi
+if [ "X${CONFIG_INFINIBAND_I40IW}" == "Xm" ]; then
+        DEFINE_INFINIBAND_I40IW="#undef CONFIG_INFINIBAND_I40IW\n#define CONFIG_INFINIBAND_I40IW 1"
+else
+        DEFINE_INFINIBAND_I40IW="#undef CONFIG_INFINIBAND_I40IW"
+fi
+if [ "X${CONFIG_I40E}" == "Xm" ]; then
+        DEFINE_I40E="#undef CONFIG_I40E\n#define CONFIG_I40E 1"
+else
+        DEFINE_I40E="#undef CONFIG_I40E"
+fi
 if [ "X${CONFIG_INFINIBAND_NES}" == "Xm" ]; then
         DEFINE_INFINIBAND_NES="#undef CONFIG_INFINIBAND_NES\n#define CONFIG_INFINIBAND_NES 1"
 else
@@ -1362,6 +1388,8 @@ $(echo -e "${DEFINE_INFINIBAND_CXGB3}" | grep -v undef)
 $(echo -e "${DEFINE_CHELSIO_T3}" | grep -v undef)
 $(echo -e "${DEFINE_INFINIBAND_CXGB4}" | grep -v undef)
 $(echo -e "${DEFINE_CHELSIO_T4}" | grep -v undef)
+$(echo -e "${DEFINE_INFINIBAND_I40IW}" | grep -v undef)
+$(echo -e "${DEFINE_I40E}" | grep -v undef)
 $(echo -e "${DEFINE_INFINIBAND_NES}" | grep -v undef)
 $(echo -e "${DEFINE_INFINIBAND_OCRDMA}" | grep -v undef)
 $(echo -e "${DEFINE_BE2NET}" | grep -v undef)
@@ -1467,6 +1495,8 @@ $(echo -e "${DEFINE_NVME_FABRICS}" | grep -v undef)
 #undef CONFIG_CHELSIO_T4
 #undef CONFIG_SCSI_CXGB3_ISCSI
 #undef CONFIG_SCSI_CXGB4_ISCSI
+#undef CONFIG_INFINIBAND_I40IW
+#undef CONFIG_I40E
 #undef CONFIG_INFINIBAND_NES
 #undef CONFIG_INFINIBAND_NES_DEBUG
 #undef CONFIG_INFINIBAND_OCRDMA
@@ -1510,6 +1540,8 @@ $(echo -e "${DEFINE_INFINIBAND_CXGB3}")
 $(echo -e "${DEFINE_CHELSIO_T3}")
 $(echo -e "${DEFINE_INFINIBAND_CXGB4}")
 $(echo -e "${DEFINE_CHELSIO_T4}")
+$(echo -e "${DEFINE_INFINIBAND_I40IW}")
+$(echo -e "${DEFINE_I40E}")
 $(echo -e "${DEFINE_INFINIBAND_NES}")
 $(echo -e "${DEFINE_INFINIBAND_OCRDMA}")
 $(echo -e "${DEFINE_BE2NET}")

diff --git a/makefile b/makefile
index 6de18632cd8305018835aced13baed2d51b63001..2fc951f4a38bf6d0bf634fc07c943e6940e521ac 100644 (file)
--- a/makefile
+++ b/makefile
@@ -121,6 +121,7 @@ kernel: $(COMPAT_CONFIG) $(COMPAT_AUTOCONF)
                CONFIG_INFINIBAND_CXGB4=$(CONFIG_INFINIBAND_CXGB4) \
                CONFIG_SCSI_CXGB3_ISCSI=$(CONFIG_SCSI_CXGB3_ISCSI) \
                CONFIG_SCSI_CXGB4_ISCSI=$(CONFIG_SCSI_CXGB4_ISCSI) \
+               CONFIG_INFINIBAND_I40IW=$(CONFIG_INFINIBAND_I40IW) \
                CONFIG_INFINIBAND_NES=$(CONFIG_INFINIBAND_NES) \
                CONFIG_INFINIBAND_NES_DEBUG=$(CONFIG_INFINIBAND_NES_DEBUG) \
                CONFIG_MLX4_CORE=$(CONFIG_MLX4_CORE) \