From: Brandon Streiff <brandon.streiff@ni.com>
Date: Mon, 16 Jul 2018 21:53:56 +0000 (-0500)
Subject: interfaces/linux: make dsa special
X-Git-Tag: 1.0.4~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a636b31d72eacafc5b33a6af15c9776e8eca2c17;p=thirdparty%2Flldpd.git

interfaces/linux: make dsa special

There used to be specific exemptions carved out for "veth" and "dsa",
which were removed in b8db52bd7c7d ("interfaces/linux: blacklist some
drivers instead of whitelisting"). "veth" was restored in 2958b9d48940
("interfaces/linux: make veth special"). This commit restores the
whitelist for dsa devices as well.
---

diff --git a/src/daemon/interfaces-linux.c b/src/daemon/interfaces-linux.c
index dff32190..9af41a58 100644
--- a/src/daemon/interfaces-linux.c
+++ b/src/daemon/interfaces-linux.c
@@ -994,7 +994,7 @@ iflinux_add_physical(struct lldpd *cfg,
 		}
 
 		/* If the interface is linked to another one, skip it too. */
-		if (iface->lower && (!iface->driver || strcmp(iface->driver, "veth"))) {
+		if (iface->lower && (!iface->driver || (strcmp(iface->driver, "veth") && strcmp(iface->driver, "dsa")))) {
 			log_debug("interfaces", "skip %s: there is a lower interface (%s)",
 			    iface->name, iface->lower->name);
 			continue;