aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brown <mcb30@ipxe.org>2016-04-18 10:08:46 +0100
committerMichael Brown <mcb30@ipxe.org>2016-04-18 10:08:46 +0100
commit40a8a5294c0cb0f8fe6f608600dc8ed8d1f2b0c5 (patch)
tree67f0e2a3f71577d8f4b3a247069da5691ba59a09
parent988243c93fb87190e1867ef913136ecf139e7cb8 (diff)
downloadipxe-40a8a5294c0cb0f8fe6f608600dc8ed8d1f2b0c5.tar.gz
[ethernet] Make LACP support configurable at build time
Add a build configuration option NET_PROTO_LACP to control whether or not LACP support is included for Ethernet devices. Signed-off-by: Michael Brown <mcb30@ipxe.org>
-rw-r--r--src/config/config_ethernet.c3
-rw-r--r--src/config/general.h1
-rw-r--r--src/net/ethernet.c3
3 files changed, 4 insertions, 3 deletions
diff --git a/src/config/config_ethernet.c b/src/config/config_ethernet.c
index de7a07c57..b5f7ddc9d 100644
--- a/src/config/config_ethernet.c
+++ b/src/config/config_ethernet.c
@@ -43,3 +43,6 @@ REQUIRE_OBJECT ( fcoe );
#ifdef NET_PROTO_STP
REQUIRE_OBJECT ( stp );
#endif
+#ifdef NET_PROTO_LACP
+REQUIRE_OBJECT ( eth_slow );
+#endif
diff --git a/src/config/general.h b/src/config/general.h
index 675c11e07..a21501500 100644
--- a/src/config/general.h
+++ b/src/config/general.h
@@ -38,6 +38,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
#undef NET_PROTO_IPV6 /* IPv6 protocol */
#undef NET_PROTO_FCOE /* Fibre Channel over Ethernet protocol */
#define NET_PROTO_STP /* Spanning Tree protocol */
+#define NET_PROTO_LACP /* Link Aggregation control protocol */
/*
* PXE support
diff --git a/src/net/ethernet.c b/src/net/ethernet.c
index 6ddf05344..26fdedea8 100644
--- a/src/net/ethernet.c
+++ b/src/net/ethernet.c
@@ -278,6 +278,3 @@ REQUIRING_SYMBOL ( ethernet_protocol );
/* Drag in Ethernet configuration */
REQUIRE_OBJECT ( config_ethernet );
-
-/* Drag in Ethernet slow protocols */
-REQUIRE_OBJECT ( eth_slow );