Added benet support

issue: http://bugs.openfabrics.org/show_bug.cgi?id=2460

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

diff --git a/Makefile b/Makefile
index 72e8de7fa86988395629690224efe618ae421bde..899ccbe41d67b7febbd8009a883327fdfb4dcc11 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ obj-$(CONFIG_CHELSIO_T3)        += drivers/net/ethernet/chelsio/cxgb3/
 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_RDS)               += net/rds/
 obj-$(CONFIG_SUNRPC_XPRT_RDMA)  += net/sunrpc/xprtrdma/
 # obj-$(CONFIG_SCSI_CXGB3_ISCSI)  += drivers/scsi/cxgbi/

diff --git a/configure b/configure
index 396457ab92911e69e4e85f38f66a82edd028b7dc..36c1634b3b44c6db8f4015b749c2b47a36562f4a 100755 (executable)
--- a/configure
+++ b/configure
@@ -162,6 +162,9 @@ Usage:  `basename $0` [options]
 
     --with-ocrdma-mod    make CONFIG_INFINIBAND_OCRDMA=m [no]
     --without-ocrdma-mod    [yes]
+    
+    --with-be2net-mod    make CONFIG_BE2NET=m [no]
+    --without-be2net-mod    [yes]
 
     --with-nes_debug-mod    make CONFIG_INFINIBAND_NES_DEBUG=y [no]
     --without-nes_debug-mod    [yes]
@@ -599,10 +602,17 @@ main()
                         ;;
                         --with-ocrdma-mod)
                             CONFIG_INFINIBAND_OCRDMA="m"
+                            CONFIG_BE2NET="m"
                         ;;
                         --without-ocrdma-mod)
                             CONFIG_INFINIBAND_OCRDMA=
                         ;;
+                        --with-be2net-mod)
+                            CONFIG_BE2NET="m"
+                        ;;
+                        --without-be2net-mod)
+                            CONFIG_BE2NET=
+                        ;;
                         --with-nfsrdma-mod)
                             CONFIG_SUNRPC_XPRT_RDMA="m"
                             CONFIG_NFSD_RDMA="y"
@@ -707,6 +717,7 @@ CONFIG_SCSI_CXGB3_ISCSI=${CONFIG_SCSI_CXGB3_ISCSI:-''}
 CONFIG_SCSI_CXGB4_ISCSI=${CONFIG_SCSI_CXGB4_ISCSI:-''}
 CONFIG_INFINIBAND_NES=${CONFIG_INFINIBAND_NES:-''}
 CONFIG_INFINIBAND_OCRDMA=${CONFIG_INFINIBAND_OCRDMA:-''}
+CONFIG_BE2NET=${CONFIG_BE2NET:-''}
 
 CONFIG_SUNRPC_XPRT_RDMA=${CONFIG_SUNRPC_XPRT_RDMA:-''} 
 CONFIG_SUNRPC=${CONFIG_SUNRPC:-''} 
@@ -824,6 +835,7 @@ CONFIG_SCSI_CXGB3_ISCSI=${CONFIG_SCSI_CXGB3_ISCSI}
 CONFIG_SCSI_CXGB4_ISCSI=${CONFIG_SCSI_CXGB4_ISCSI}
 CONFIG_INFINIBAND_NES=${CONFIG_INFINIBAND_NES}
 CONFIG_INFINIBAND_OCRDMA=${CONFIG_INFINIBAND_OCRDMA}
+CONFIG_BE2NET=${CONFIG_BE2NET}
 
 CONFIG_SUNRPC_XPRT_RDMA=${CONFIG_SUNRPC_XPRT_RDMA}
 CONFIG_SUNRPC=${CONFIG_SUNRPC}
@@ -1115,6 +1127,11 @@ if [ "X${CONFIG_INFINIBAND_OCRDMA}" == "Xm" ]; then
 else
         DEFINE_INFINIBAND_OCRDMA="#undef CONFIG_INFINIBAND_OCRDMA"
 fi
+if [ "X${CONFIG_BE2NET}" == "Xm" ]; then
+        DEFINE_BE2NET="#undef CONFIG_BE2NET\n#define CONFIG_BE2NET 1"
+else
+        DEFINE_BE2NET="#undef CONFIG_BE2NET"
+fi
 if [ "X${CONFIG_INFINIBAND_NES_DEBUG}" == "Xy" ]; then
         DEFINE_INFINIBAND_NES_DEBUG="#undef CONFIG_INFINIBAND_NES_DEBUG\n#define CONFIG_INFINIBAND_NES_DEBUG 1"
 else
@@ -1196,6 +1213,7 @@ $(echo -e "${DEFINE_INFINIBAND_CXGB4}" | grep -v undef)
 $(echo -e "${DEFINE_CHELSIO_T4}" | 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)
 
 $(echo -e "${DEFINE_SUNRPC_XPRT_RDMA}" | grep -v undef)
 $(echo -e "${DEFINE_SUNRPC}" | grep -v undef)
@@ -1297,6 +1315,7 @@ $(echo -e "${DEFINE_INFINIBAND_AMSO1100}" | grep -v undef)
 #undef CONFIG_INFINIBAND_NES
 #undef CONFIG_INFINIBAND_NES_DEBUG
 #undef CONFIG_INFINIBAND_OCRDMA
+#undef CONFIG_BE2NET
 
 #undef CONFIG_SUNRPC_XPRT_RDMA
 #undef CONFIG_SUNRPC
@@ -1350,6 +1369,7 @@ $(echo -e "${DEFINE_INFINIBAND_CXGB4}")
 $(echo -e "${DEFINE_CHELSIO_T4}")
 $(echo -e "${DEFINE_INFINIBAND_NES}")
 $(echo -e "${DEFINE_INFINIBAND_OCRDMA}")
+$(echo -e "${DEFINE_BE2NET}")
 
 $(echo -e "${DEFINE_SUNRPC_XPRT_RDMA}")
 $(echo -e "${DEFINE_SUNRPC}")

diff --git a/makefile b/makefile
index 6f355ee14f3a3ebfa032c5208119f3a9cad3419c..e2a86e080867896d370ce794a71b5fffca758c4e 100644 (file)
--- a/makefile
+++ b/makefile
@@ -132,6 +132,7 @@ kernel: $(COMPAT_CONFIG) $(COMPAT_AUTOCONF)
                CONFIG_SUNRPC_XPRT_RDMA=$(CONFIG_SUNRPC_XPRT_RDMA) \
                CONFIG_NFSD_RDMA=$(CONFIG_NFSD_RDMA) \
                CONFIG_INFINIBAND_OCRDMA=$(CONFIG_INFINIBAND_OCRDMA) \
+               CONFIG_BE2NET=$(CONFIG_BE2NET) \
                CONFIG_INFINIBAND_ISERT=$(CONFIG_INFINIBAND_ISERT) \
                LINUXINCLUDE=' \
                -D__OFED_BUILD__ \

diff --git a/ofed_scripts/checkout_files b/ofed_scripts/checkout_files
index 5802242901ea3cb5770642b9cc243bfe663f2474..1d9bf0edf0d6e4ae81c53b24c2c63e15cf725c4a 100644 (file)
--- a/ofed_scripts/checkout_files
+++ b/ofed_scripts/checkout_files
@@ -2,6 +2,7 @@ Documentation/infiniband/
 drivers/infiniband/
 drivers/net/ethernet/chelsio/cxgb3/
 drivers/net/ethernet/chelsio/cxgb4/
+drivers/net/ethernet/emulex/benet/
 drivers/net/ethernet/mellanox/
 include/linux/mlx4/
 include/linux/mlx5/