From: Vincent Bernat <bernat@luffy.cx>
Date: Thu, 11 Dec 2008 19:42:09 +0000 (+0100)
Subject: Merge branch 'master' into lldpmed
X-Git-Tag: 0.3~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c1471068c468e627a97931f5e59ec7a16fb5c815;p=thirdparty%2Flldpd.git

Merge branch 'master' into lldpmed
---

c1471068c468e627a97931f5e59ec7a16fb5c815
diff --cc CHANGELOG
index 6b1aba3e,7d407ad6..50aacb3d
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -1,7 -1,9 +1,9 @@@
  lldpd (0.3)
  
 -  * Initial support of LLDP-MED (inventory part)
 +  * Initial support of LLDP-MED
    * Fix for bridge detection (don't send bridge ioctl on random interfaces)
+   * For bonded devices, get the real hardware address. For inactive
+     slaves, transmit using a random MAC address.
  
   -- Vincent Bernat <bernat@luffy.cx>