X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fiface-linux.c;h=985fe3f9ef1413f37e451ab69f6a4bd234eaf018;hb=2afb248985218ecb5c3b105ff04a986a506b59f9;hp=bc871524cb4d93971202610b21a70e51f6d995d3;hpb=ab758d7bf41d1d7565e80fe5d2bded0d18160ccb;p=catta

diff --git a/avahi-core/iface-linux.c b/avahi-core/iface-linux.c
index bc87152..985fe3f 100644
--- a/avahi-core/iface-linux.c
+++ b/avahi-core/iface-linux.c
@@ -124,8 +124,8 @@ static void netlink_callback(AvahiNetlink *nl, struct nlmsghdr *n, void* userdat
 
                     /* Fill in hardware (MAC) address */
                     hw->mac_address_size = RTA_PAYLOAD(a);
-                    if (hw->mac_address_size > AVAHI_MAX_MAC_ADDRESS)
-                        hw->mac_address_size = AVAHI_MAX_MAC_ADDRESS;
+                    if (hw->mac_address_size > AVAHI_MAC_ADDRESS_MAX)
+                        hw->mac_address_size = AVAHI_MAC_ADDRESS_MAX;
                     
                     memcpy(hw->mac_address, RTA_DATA(a), hw->mac_address_size);
                     break;
@@ -352,10 +352,9 @@ void avahi_interface_monitor_sync(AvahiInterfaceMonitor *m) {
     /* Let's handle netlink events until we are done with wild
      * dumping */
     
-    while (m->osdep.list != LIST_DONE) {
+    while (!m->list_complete)
         if (!avahi_netlink_work(m->osdep.netlink, 1) == 0)
             break;
-    }
 
     /* At this point Avahi knows about all local interfaces and
      * addresses in existance. */