From: Vincent Bernat <vincent@bernat.ch>
Date: Tue, 8 Oct 2019 18:36:33 +0000 (+0200)
Subject: Merge branch 'feature/vlan-enabled-bridge'
X-Git-Tag: 1.0.5~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92e3b3ac319911ca7169ed8d87c1b4f374c5bfda;p=thirdparty%2Flldpd.git

Merge branch 'feature/vlan-enabled-bridge'
---

92e3b3ac319911ca7169ed8d87c1b4f374c5bfda
diff --cc NEWS
index 2bef25c8,9ce0b94c..9cacee82
--- a/NEWS
+++ b/NEWS
@@@ -1,11 -1,7 +1,12 @@@
  lldpd (1.0.5)
    * Changes:
      + Interface names are also matched for management addresses.
 +    + On Linux, only register protocol handler for LLDP when only LLDP
 +      is enabled.
 +    + Stricter on LLDP incoming frames validation.
+     + Add support for VLAN-aware bridges for Linux (no range support).
 +  * Fix:
 +    + Don't clear chassis TLV on shutdown LLDPDU.
  
  lldpd (1.0.4)
    * Changes: