aboutsummaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorMichael Brown <mcb30@ipxe.org>2015-03-04 17:22:07 +0000
committerMichael Brown <mcb30@ipxe.org>2015-03-05 00:57:44 +0000
commit86ae6e6c1836e43993a14db278398fc54e5419bd (patch)
tree92758900be8ba37c36448094747ace0c2f97e13e /src/net
parent04c1ea81709b3de2658331761eb94843110c165f (diff)
downloadipxe-86ae6e6c1836e43993a14db278398fc54e5419bd.zip
ipxe-86ae6e6c1836e43993a14db278398fc54e5419bd.tar.gz
ipxe-86ae6e6c1836e43993a14db278398fc54e5419bd.tar.bz2
[build] Use REQUIRE_OBJECT() to drag in per-object configuration
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/net')
-rw-r--r--src/net/80211/net80211.c3
-rw-r--r--src/net/ethernet.c3
-rw-r--r--src/net/fc.c3
-rw-r--r--src/net/infiniband.c3
4 files changed, 12 insertions, 0 deletions
diff --git a/src/net/80211/net80211.c b/src/net/80211/net80211.c
index 4349445..d2051f6 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 1ca92a2..a4bdfd4 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 d37e81e..459f6fc 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 fcc8a63..7e545f7 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 );