linux: add support for team devices

diff --git a/NEWS b/NEWS
index 7963a3c9fb19332307c5fb8c3103558132e7dfb2..76a56ab2333e9ee452d11a1ec21fefb9d7b2dc06 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ lldpd (0.7.7)
     + Use a locally administered MAC address or an arbitrary one
       instead of null MAC address for bond devices on Linux. This is
       configurable through `lldpcli`.
+    + Add support for "team" driver (alternative to bond devices).
   * Fixes:
     + Various bugs related to fixed point number handling (for
       coordinates in LLDP-MED)

diff --git a/src/daemon/interfaces-linux.c b/src/daemon/interfaces-linux.c
index 63b96a660ab09b4ac176debc723db23386b6dfb9..f756d9a52443d766e6921ee40140e2329440be1a 100644 (file)
--- a/src/daemon/interfaces-linux.c
+++ b/src/daemon/interfaces-linux.c
@@ -229,6 +229,12 @@ iflinux_is_bond(struct lldpd *cfg,
     struct interfaces_device_list *interfaces,
     struct interfaces_device *master)
 {
+       /* Shortcut if we detect the new team driver. Upper and lower links
+        * should already be set with netlink in this case.  */
+       if (master->driver && !strcmp(master->driver, "team")) {
+               return 1;
+       }
+
        struct ifreq ifr = {};
        struct ifbond ifb = {};
        strlcpy(ifr.ifr_name, master->name, sizeof(ifr.ifr_name));