diff options
| author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-12-07 18:35:46 +0100 |
|---|---|---|
| committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-12-07 18:35:46 +0100 |
| commit | 46434a3cad99260b5a659e5df874eab4615bcb36 (patch) | |
| tree | e5f4842fbdcc2ee0c66d6fdb437cb401a7234fb1 /nest/locks.c | |
| parent | 4ff15a75c56531fa2d3858d8250dcef1af4e75b6 (diff) | |
| parent | 7b2c5f3d2826e3175bf31b1c36056c9efc587a2b (diff) | |
Merge commit '7b2c5f3d2826e3175bf31b1c36056c9efc587a2b' into int-new
Diffstat (limited to 'nest/locks.c')
| -rw-r--r-- | nest/locks.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nest/locks.c b/nest/locks.c index 84b8b0ae..86c9ff14 100644 --- a/nest/locks.c +++ b/nest/locks.c @@ -45,6 +45,7 @@ olock_same(struct object_lock *x, struct object_lock *y) return x->type == y->type && x->iface == y->iface && + x->vrf == y->vrf && x->port == y->port && x->inst == y->inst && ipa_equal(x->addr, y->addr); |