From: Ben Pfaff Date: Wed, 2 Sep 2009 18:11:38 +0000 (-0700) Subject: ofproto: Fix bad merge in previous commit. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0a5fd2aedd07c7c68878045f5c310a1484cf676;p=openvswitch ofproto: Fix bad merge in previous commit. This was fixed in my working tree before I pushed it, but I forgot to commit it. Oops. --- diff --git a/ofproto/in-band.c b/ofproto/in-band.c index 18415f48..35ea534c 100644 --- a/ofproto/in-band.c +++ b/ofproto/in-band.c @@ -170,7 +170,7 @@ get_local_mac(struct in_band *ib) time_t now = time_now(); if (now >= ib->next_local_refresh) { uint8_t ea[ETH_ADDR_LEN]; - if (ib->local_netdev && netdev_get_etheraddr(ib->local_netdev, ea)) { + if (ib->local_netdev && !netdev_get_etheraddr(ib->local_netdev, ea)) { memcpy(ib->local_mac, ea, ETH_ADDR_LEN); } ib->next_local_refresh = now + 1;