summaryrefslogtreecommitdiff
path: root/proto/pipe
diff options
context:
space:
mode:
authorJan Moskyto Matejka <mq@ucw.cz>2016-05-10 14:21:15 +0200
committerJan Moskyto Matejka <mq@ucw.cz>2016-05-10 14:21:15 +0200
commit92912f063a94bd7c743a25628ca2073380e09ef4 (patch)
treee8328b04713b3004747bcd3160294dd97e16b35e /proto/pipe
parenta8caff322f83f1303c408bbefc440aeea9e619a3 (diff)
parent2003a1840731bd57365876e48c96c5a1ea0348cb (diff)
Merge remote-tracking branch 'origin/rte-update' into int-new
Diffstat (limited to 'proto/pipe')
-rw-r--r--proto/pipe/pipe.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c
index f3df3e71..d40b3f91 100644
--- a/proto/pipe/pipe.c
+++ b/proto/pipe/pipe.c
@@ -50,7 +50,6 @@ pipe_rt_notify(struct proto *P, struct channel *src_ch, net *n, rte *new, rte *o
struct channel *dst = (src_ch == p->pri) ? p->sec : p->pri;
struct rte_src *src;
- net *nn;
rte *e;
rta a;
@@ -64,7 +63,6 @@ pipe_rt_notify(struct proto *P, struct channel *src_ch, net *n, rte *new, rte *o
return;
}
- nn = net_get(dst->table, n->n.addr);
if (new)
{
memcpy(&a, new->attrs, sizeof(rta));
@@ -73,7 +71,6 @@ pipe_rt_notify(struct proto *P, struct channel *src_ch, net *n, rte *new, rte *o
a.eattrs = attrs;
a.hostentry = NULL;
e = rte_get_temp(&a);
- e->net = nn;
e->pflags = 0;
/* Copy protocol specific embedded attributes. */
@@ -90,7 +87,7 @@ pipe_rt_notify(struct proto *P, struct channel *src_ch, net *n, rte *new, rte *o
}
src_ch->table->pipe_busy = 1;
- rte_update2(dst, nn, e, src);
+ rte_update2(dst, n->n.addr, e, src);
src_ch->table->pipe_busy = 0;
}