From 5bcaa1e4d4217911ef7c557a1da49b6248161e80 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 9 Mar 2016 08:41:53 +0000 Subject: [PATCH] [infiniband] Make IPoIB support configurable at build time Add a build configuration option VNIC_IPOIB to control whether or not IPoIB support is included for Infiniband devices. Signed-off-by: Michael Brown --- src/config/config_infiniband.c | 7 +++++++ src/config/general.h | 6 ++++++ src/net/infiniband.c | 3 --- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/config/config_infiniband.c b/src/config/config_infiniband.c index 8c63fb00e..9bac3b7c4 100644 --- a/src/config/config_infiniband.c +++ b/src/config/config_infiniband.c @@ -38,6 +38,13 @@ PROVIDE_REQUIRING_SYMBOL(); REQUIRE_OBJECT ( ib_srp ); #endif +/* + * Drag in Infiniband-specific virtual network devices + */ +#ifdef VNIC_IPOIB +REQUIRE_OBJECT ( ipoib ); +#endif + /* * Drag in Infiniband-specific commands */ diff --git a/src/config/general.h b/src/config/general.h index dba412128..9c4330399 100644 --- a/src/config/general.h +++ b/src/config/general.h @@ -153,6 +153,12 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #undef NONPNP_HOOK_INT19 /* Hook INT19 on non-PnP BIOSes */ #define AUTOBOOT_ROM_FILTER /* Autoboot only devices matching our ROM */ +/* + * Virtual network devices + * + */ +#define VNIC_IPOIB /* Infiniband IPoIB virtual NICs */ + /* * Error message tables to include * diff --git a/src/net/infiniband.c b/src/net/infiniband.c index df95579d1..15ff0529b 100644 --- a/src/net/infiniband.c +++ b/src/net/infiniband.c @@ -1052,6 +1052,3 @@ REQUIRING_SYMBOL ( register_ibdev ); /* Drag in Infiniband configuration */ REQUIRE_OBJECT ( config_infiniband ); - -/* Drag in IPoIB */ -REQUIRE_OBJECT ( ipoib );