git://git.onelab.eu
/
sliver-openvswitch.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f1acd62
)
ofproto: Fix bad merge in previous commit.
author
Ben Pfaff
<blp@nicira.com>
Wed, 2 Sep 2009 18:11:38 +0000
(11:11 -0700)
committer
Ben Pfaff
<blp@nicira.com>
Wed, 2 Sep 2009 18:11:38 +0000
(11:11 -0700)
This was fixed in my working tree before I pushed it, but I forgot to
commit it. Oops.
ofproto/in-band.c
patch
|
blob
|
history
diff --git
a/ofproto/in-band.c
b/ofproto/in-band.c
index
18415f4
..
35ea534
100644
(file)
--- 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;