From 86ae6e6c1836e43993a14db278398fc54e5419bd Mon Sep 17 00:00:00 2001
From: Michael Brown
Date: Wed, 4 Mar 2015 17:22:07 +0000
Subject: [build] Use REQUIRE_OBJECT() to drag in per-object configuration

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---
 src/net/80211/net80211.c | 3 +++
 src/net/ethernet.c       | 3 +++
 src/net/fc.c             | 3 +++
 src/net/infiniband.c     | 3 +++
 4 files changed, 12 insertions(+)

(limited to 'src/net')

diff --git a/src/net/80211/net80211.c b/src/net/80211/net80211.c
index 434944523..d2051f642 100644
--- a/src/net/80211/net80211.c
+++ b/src/net/80211/net80211.c
@@ -2826,3 +2826,6 @@ struct errortab common_wireless_errors[] __errortab = {
 	__einfo_errortab ( EINFO_ECONNREFUSED_ASSOC_DENIED ),
 	__einfo_errortab ( EINFO_ECONNREFUSED_AUTH_ALGO_UNSUPP ),
 };
+
+/* Drag in 802.11 configuration */
+REQUIRE_OBJECT ( config_net80211 );
diff --git a/src/net/ethernet.c b/src/net/ethernet.c
index 1ca92a20f..a4bdfd4ee 100644
--- a/src/net/ethernet.c
+++ b/src/net/ethernet.c
@@ -239,5 +239,8 @@ struct net_device * alloc_etherdev ( size_t priv_size ) {
 	return netdev;
 }
 
+/* Drag in Ethernet configuration */
+REQUIRE_OBJECT ( config_ethernet );
+
 /* Drag in Ethernet slow protocols */
 REQUIRE_OBJECT ( eth_slow );
diff --git a/src/net/fc.c b/src/net/fc.c
index d37e81eb9..459f6fc36 100644
--- a/src/net/fc.c
+++ b/src/net/fc.c
@@ -1939,3 +1939,6 @@ struct fc_ulp * fc_ulp_get_port_id_type ( struct fc_port *port,
  err_peer_get_wwn:
 	return NULL;
 }
+
+/* Drag in Fibre Channel configuration */
+REQUIRE_OBJECT ( config_fc );
diff --git a/src/net/infiniband.c b/src/net/infiniband.c
index fcc8a6396..7e545f74b 100644
--- a/src/net/infiniband.c
+++ b/src/net/infiniband.c
@@ -999,5 +999,8 @@ struct ib_device * last_opened_ibdev ( void ) {
 	return ibdev;
 }
 
+/* Drag in Infiniband configuration */
+REQUIRE_OBJECT ( config_infiniband );
+
 /* Drag in IPoIB */
 REQUIRE_OBJECT ( ipoib );
-- 
cgit v1.2.3-55-g7522