From: Vincent Bernat <vincent@bernat.im>
Date: Sun, 7 Aug 2016 08:22:27 +0000 (+0200)
Subject: interface: use 10GBASE-CX4 for copper
X-Git-Tag: 0.9.5~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2fb135c8c5d75c520ff97efe39547e3a689f288a;p=thirdparty%2Flldpd.git

interface: use 10GBASE-CX4 for copper

That's the best approximation available in RFC4836.
---

diff --git a/NEWS b/NEWS
index 8e83039e..fad18ee6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,8 @@
 lldpd (0.9.5)
+  * Change:
+    + More Ethernet media supported. However, RFC4836 is quite
+      out-of-date with respected to 10G+ speeds, bringing some
+      inaccuracies.
   * Fix:
     + Compilation fix with older versions of GCC.
     + Don't use ethtool at all to get real MAC address for enslaved
diff --git a/src/daemon/interfaces-linux.c b/src/daemon/interfaces-linux.c
index 663cd0ac..06423e03 100644
--- a/src/daemon/interfaces-linux.c
+++ b/src/daemon/interfaces-linux.c
@@ -384,7 +384,7 @@ iflinux_macphy(struct lldpd_hardware *hardware)
 			// fiber either but we don't have 10GIGBASET for
 			// copper. No good solution.
 			port->p_macphy.mau_type = (ethc.port == PORT_FIBRE) ?	\
-					LLDP_DOT3_MAU_10GIGBASEX : LLDP_DOT3_MAU_10GIGBASER;
+					LLDP_DOT3_MAU_10GIGBASELR : LLDP_DOT3_MAU_10GIGBASECX4;
 			break;
 		}
 		if (ethc.port == PORT_AUI) port->p_macphy.mau_type = LLDP_DOT3_MAU_AUI;